From 6658b17f4f704e0c23595da1d763e2d04e5340a6 Mon Sep 17 00:00:00 2001
From: Dave Rolsky <autarch@urth.org>
Date: Tue, 2 Feb 2021 23:54:12 -0500
Subject: [PATCH 1/5] Add arch name to archive files created in the upload
 workflow (#4679)

* Add arch name to archive files created in the upload workflow

* Fix arch names in matrix.build key to include arch name as well
---
 .github/workflows/upload-assets.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/upload-assets.yml b/.github/workflows/upload-assets.yml
index 238d092b7b1..9a5fd0dd1d3 100644
--- a/.github/workflows/upload-assets.yml
+++ b/.github/workflows/upload-assets.yml
@@ -9,18 +9,18 @@ jobs:
     name: build-release
     strategy:
       matrix:
-        build: [linux, macos, windows-gnu, windows-msvc]
+        build: [linux-x86_64, macos-x86_64, windows-x86_64-gnu, windows-x86_64-msvc]
         include:
-          - build: linux
+          - build: linux-x86_64
             os: ubuntu-latest
             rust: nightly
-          - build: macos
+          - build: macos-x86_64
             os: macos-latest
             rust: nightly
-          - build: windows-gnu
+          - build: windows-x86_64-gnu
             os: windows-latest
             rust: nightly-x86_64-gnu
-          - build: windows-msvc
+          - build: windows-x86_64-msvc
             os: windows-latest
             rust: nightly-x86_64-msvc
     runs-on: ${{ matrix.os }}

From e3fbfc817aa660bd9fde8b26aa3f6bf1e852864d Mon Sep 17 00:00:00 2001
From: Caleb Cartwright <caleb.cartwright@outlook.com>
Date: Sun, 31 Jan 2021 16:08:00 -0600
Subject: [PATCH 2/5] deps: bump rustc-ap crates to v701.0.0

---
 Cargo.lock           | 83 ++++++++++++++++++++++----------------------
 Cargo.toml           | 16 ++++-----
 src/macros.rs        |  4 +--
 src/syntux/parser.rs |  7 ++--
 4 files changed, 56 insertions(+), 54 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ce45f679f11..1251dd4e378 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -878,18 +878,18 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_arena"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb953bea2006184c8f01a6fd3ed51658c73380992a9aefc113e8d32ece6b7516"
+checksum = "3d38617318fc3f9e4af4337d0050fde5b84f9beddccb958848d792d4edde8778"
 dependencies = [
  "smallvec",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_ast"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94da60fa49b2f60d2539e8823cf2b4d4e61583ba4ee796b8289e12f017d3dc5b"
+checksum = "766e6b4657e76f385df0ee3d8b5e2e9c69ee3f83f04d078c89481a698c8f681b"
 dependencies = [
  "bitflags",
  "rustc-ap-rustc_data_structures",
@@ -904,9 +904,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_ast_passes"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e9f9eaaee223832187a398abe0f9cb8bc4e5cd538322d8f3864aea65239c79e"
+checksum = "3671911e1bcc6eb68d79513e9b7e19c451e809258a7216b31107c69bc62121fd"
 dependencies = [
  "itertools 0.9.0",
  "rustc-ap-rustc_ast",
@@ -923,21 +923,20 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_ast_pretty"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302b43429c62efc43b159b1f8ab94c8b517fb553cbae854c3fcf34e01c36accb"
+checksum = "8626407c0f378925f9b30ab8712caf0ff27576895cb791d96ce0288790e739c5"
 dependencies = [
  "rustc-ap-rustc_ast",
  "rustc-ap-rustc_span",
- "rustc-ap-rustc_target",
  "tracing",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_attr"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cbd78cb6f7ca0991478d7f1bc5646b6eca58c37ccbdf70b5d83c490a7c47be7"
+checksum = "1fbd2c005491bc0c95300b5c7d7eed0a1239048018a1f73556ec14e5ebd3053a"
 dependencies = [
  "rustc-ap-rustc_ast",
  "rustc-ap-rustc_ast_pretty",
@@ -949,14 +948,13 @@ dependencies = [
  "rustc-ap-rustc_serialize",
  "rustc-ap-rustc_session",
  "rustc-ap-rustc_span",
- "version_check",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_data_structures"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b9ebd359b0f21086a88595a25d92dc7e8e5f7b111e41c52bb6c97e2d95fd0bb"
+checksum = "6ba2102a9d877154fb276581cd67116899be5cef2119991e3c7be1dab514a665"
 dependencies = [
  "arrayvec 0.5.1",
  "bitflags",
@@ -985,9 +983,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_errors"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b810fcac4d738c47d7793afe3e0f2e03d5193c36c698b0fbcebfb64e468c06b"
+checksum = "ebf9bd7d872bd3179eeeebbcd7befed10abda976dcf0db7d3afc74e68ef9d8d0"
 dependencies = [
  "annotate-snippets 0.8.0",
  "atty",
@@ -1005,9 +1003,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_expand"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f5b44aadd09c05a42a21a063e9f2241fd3d9c00c3dd6e474e22c3a3e8274c959"
+checksum = "7895c9b0957d5793df4291076b6757fe660787e6cba3a0fa415498e1a31dcced"
 dependencies = [
  "rustc-ap-rustc_ast",
  "rustc-ap-rustc_ast_passes",
@@ -1028,9 +1026,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_feature"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2f4121cb9718c8c1c6350a3aaea619fbbae38fb1aadd3d7305586460babb531"
+checksum = "19ac44cfab6d4dc09f93a332556cd65be67be3675179b0583b6df831d7887a77"
 dependencies = [
  "rustc-ap-rustc_data_structures",
  "rustc-ap-rustc_span",
@@ -1038,21 +1036,21 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_fs_util"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdb0f36e34fafb725795bef3ec6f414cac34e7ca98e6d25927be36d95ae1c6ac"
+checksum = "8a6024b6e161a45c85e12950b939981e8d5235587332e9a703900e719520d8b2"
 
 [[package]]
 name = "rustc-ap-rustc_graphviz"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a98402e20e2913016ed54f12aead5c987fe227a0fb31cc720e17ff51c6f32466"
+checksum = "2ebcdd50bf977ce1c9b6f646f50fb8677d87c8fa66796fd3f5cb9c28079515c4"
 
 [[package]]
 name = "rustc-ap-rustc_index"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec91408d727f73f682cd8ae836d762c8dab0ed4e81994ced03aa1edcee3b99a4"
+checksum = "51286a5d6f25a31a2f258af12ade26e3d9e579b9661e0b153deec988a86dbde8"
 dependencies = [
  "arrayvec 0.5.1",
  "rustc-ap-rustc_macros",
@@ -1061,32 +1059,33 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_lexer"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67adbe260a0a11910624d6d28c0304fcf7b063e666682111005c83b09f73429d"
+checksum = "3601c20fc378d11e965fb1f670cf8bad1ef5164fe4ec8cbb7c57fa9d656f2541"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_lint_defs"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bf11d0646da7bd136fbca53834afcc3760fbfc20fa4875e139b3ada41ec53a5"
+checksum = "d92f9f53a0f6976216bc94fd5380686d401852b8792c977ade52a6e9c3b0fcb9"
 dependencies = [
  "rustc-ap-rustc_ast",
  "rustc-ap-rustc_data_structures",
  "rustc-ap-rustc_macros",
  "rustc-ap-rustc_serialize",
  "rustc-ap-rustc_span",
+ "rustc-ap-rustc_target",
  "tracing",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_macros"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c454b10b66750ffd9bfd7d53b0f30eaba1462356e9ac91f0d037cb0556dc7681"
+checksum = "ff03d3d0e4edadc7beee5ee825b9503741ac021ce9d25999041a0947bb3a28e8"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1096,9 +1095,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_parse"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d03f423948137a8370a88447382a18015d47a273268e3ead2d0a987c3b14070"
+checksum = "6e98331237f2b6e98bc239d2fc3b2b57e7299199dbd6d4bfaed9c2ef89d6c2ab"
 dependencies = [
  "bitflags",
  "rustc-ap-rustc_ast",
@@ -1116,9 +1115,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_serialize"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ed5df71bd37d1e179b4bbedf77db76c9e0eb2e03159c58a691adbf29f74682"
+checksum = "277c75e732e238e36e3233da40be3ac865e5e076c2900a3ee3367cf1aceb90a2"
 dependencies = [
  "indexmap",
  "smallvec",
@@ -1126,9 +1125,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_session"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e3b92b51fad25a897b23ec98961126aea038abeab8d47989f774f7727016b5e"
+checksum = "ac486189586c396b4c88b744f27e3f88776f1b9d1a6c0d612db56b54df0817d4"
 dependencies = [
  "bitflags",
  "getopts",
@@ -1148,9 +1147,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_span"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d98273206d8a571c780f233f3391ea30e29c5e75ecdc60335ccef346046e1953"
+checksum = "9414e05aeef20a513b9e042c9128772bde4db8cc972d5dc2fa126ca26f548e07"
 dependencies = [
  "cfg-if 0.1.10",
  "md-5",
@@ -1168,9 +1167,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_target"
-version = "697.0.0"
+version = "701.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08ce81fe0130e61112db5f3b2db6b21d407e4b14ae467ab9637f4696cc340ad1"
+checksum = "5f447c83857779edde1b11752e480563cd798e2284e8634864d31982b8e42de6"
 dependencies = [
  "bitflags",
  "rustc-ap-rustc_data_structures",
diff --git a/Cargo.toml b/Cargo.toml
index 6ed7608eb18..2cb787f15b6 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,11 +66,11 @@ rustc-workspace-hack = "1.0.0"
 
 [dependencies.rustc_ast]
 package = "rustc-ap-rustc_ast"
-version = "697.0.0"
+version = "701.0.0"
 
 [dependencies.rustc_ast_pretty]
 package = "rustc-ap-rustc_ast_pretty"
-version = "697.0.0"
+version = "701.0.0"
 
 [dependencies.rustc_attr]
 package = "rustc-ap-rustc_attr"
@@ -78,24 +78,24 @@ version = "697.0.0"
 
 [dependencies.rustc_data_structures]
 package = "rustc-ap-rustc_data_structures"
-version = "697.0.0"
+version = "701.0.0"
 
 [dependencies.rustc_errors]
 package = "rustc-ap-rustc_errors"
-version = "697.0.0"
+version = "701.0.0"
 
 [dependencies.rustc_expand]
 package = "rustc-ap-rustc_expand"
-version = "697.0.0"
+version = "701.0.0"
 
 [dependencies.rustc_parse]
 package = "rustc-ap-rustc_parse"
-version = "697.0.0"
+version = "701.0.0"
 
 [dependencies.rustc_session]
 package = "rustc-ap-rustc_session"
-version = "697.0.0"
+version = "701.0.0"
 
 [dependencies.rustc_span]
 package = "rustc-ap-rustc_span"
-version = "697.0.0"
+version = "701.0.0"
diff --git a/src/macros.rs b/src/macros.rs
index 119ae61d8dd..1abb1cd9e13 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -16,7 +16,7 @@ use rustc_ast::token::{BinOpToken, DelimToken, Token, TokenKind};
 use rustc_ast::tokenstream::{Cursor, LazyTokenStream, TokenStream, TokenTree};
 use rustc_ast::{ast, ptr};
 use rustc_ast_pretty::pprust;
-use rustc_parse::parser::Parser;
+use rustc_parse::parser::{ForceCollect, Parser};
 use rustc_parse::{stream_to_parser, MACRO_ARGUMENTS};
 use rustc_span::{
     symbol::{self, kw},
@@ -138,7 +138,7 @@ fn parse_macro_arg<'a, 'b: 'a>(parser: &'a mut Parser<'b>) -> Option<MacroArg> {
     // `parse_item` returns `Option<ptr::P<ast::Item>>`.
     parse_macro_arg!(
         Item,
-        |parser: &mut rustc_parse::parser::Parser<'b>| parser.parse_item(),
+        |parser: &mut rustc_parse::parser::Parser<'b>| parser.parse_item(ForceCollect::No),
         |x: Option<ptr::P<ast::Item>>| x
     );
 
diff --git a/src/syntux/parser.rs b/src/syntux/parser.rs
index c8d427478dc..6b70d83ceb9 100644
--- a/src/syntux/parser.rs
+++ b/src/syntux/parser.rs
@@ -4,7 +4,10 @@ use std::path::{Path, PathBuf};
 use rustc_ast::ast;
 use rustc_ast::token::{DelimToken, TokenKind};
 use rustc_errors::Diagnostic;
-use rustc_parse::{new_parser_from_file, parser::Parser as RawParser};
+use rustc_parse::{
+    new_parser_from_file,
+    parser::{ForceCollect, Parser as RawParser},
+};
 use rustc_span::{sym, symbol::kw, Span};
 
 use crate::attr::first_attr_value_str_by_name;
@@ -247,7 +250,7 @@ impl<'a> Parser<'a> {
             while parser.token != TokenKind::CloseDelim(DelimToken::Brace)
                 && parser.token.kind != TokenKind::Eof
             {
-                let item = match parser.parse_item() {
+                let item = match parser.parse_item(ForceCollect::No) {
                     Ok(Some(item_ptr)) => item_ptr.into_inner(),
                     Ok(None) => continue,
                     Err(mut err) => {

From 77793d9697c214d1f8ebabf0c8457effd22316ff Mon Sep 17 00:00:00 2001
From: Caleb Cartwright <caleb.cartwright@outlook.com>
Date: Tue, 2 Feb 2021 21:56:22 -0600
Subject: [PATCH 3/5] deps: bump rustc-ap to v702

---
 Cargo.lock | 81 +++++++++++++++++++++++++++---------------------------
 Cargo.toml | 16 +++++------
 2 files changed, 49 insertions(+), 48 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1251dd4e378..e001bde32d9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -878,18 +878,18 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_arena"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d38617318fc3f9e4af4337d0050fde5b84f9beddccb958848d792d4edde8778"
+checksum = "00b4ef3cb8e2471ed0beee8fa7dec927e5a04671605b606b5d650cedaeabcfd5"
 dependencies = [
  "smallvec",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_ast"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "766e6b4657e76f385df0ee3d8b5e2e9c69ee3f83f04d078c89481a698c8f681b"
+checksum = "c2e60ae0420757f5e8304a36e9ee61848b3cdeab702e2cc91e275fa71194fac9"
 dependencies = [
  "bitflags",
  "rustc-ap-rustc_data_structures",
@@ -904,9 +904,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_ast_passes"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3671911e1bcc6eb68d79513e9b7e19c451e809258a7216b31107c69bc62121fd"
+checksum = "6cf00c1a5076bb0daccf5f865d30959fdb3a9fde8207ed0ea5449f4b4057164c"
 dependencies = [
  "itertools 0.9.0",
  "rustc-ap-rustc_ast",
@@ -923,9 +923,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_ast_pretty"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8626407c0f378925f9b30ab8712caf0ff27576895cb791d96ce0288790e739c5"
+checksum = "c615111df0b80d1ec7fa1ddbc099cf1b5b885498c3ddeef6a455f456bef6aa60"
 dependencies = [
  "rustc-ap-rustc_ast",
  "rustc-ap-rustc_span",
@@ -934,9 +934,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_attr"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fbd2c005491bc0c95300b5c7d7eed0a1239048018a1f73556ec14e5ebd3053a"
+checksum = "f850527d664ae13183e72abda9ad7bfb783ad3cd3511c7b5748ad4940bfcd5ec"
 dependencies = [
  "rustc-ap-rustc_ast",
  "rustc-ap-rustc_ast_pretty",
@@ -952,9 +952,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_data_structures"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ba2102a9d877154fb276581cd67116899be5cef2119991e3c7be1dab514a665"
+checksum = "c4f0f2d7b238d9de2bcdd365e765d61309d71bcfa1a9619e22a61bc3916310a7"
 dependencies = [
  "arrayvec 0.5.1",
  "bitflags",
@@ -983,9 +983,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_errors"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebf9bd7d872bd3179eeeebbcd7befed10abda976dcf0db7d3afc74e68ef9d8d0"
+checksum = "c681cea52a193059f6a2d4d1d9d5a49af6d417a7d87c654c78acf34e8eb1d9d2"
 dependencies = [
  "annotate-snippets 0.8.0",
  "atty",
@@ -1003,9 +1003,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_expand"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7895c9b0957d5793df4291076b6757fe660787e6cba3a0fa415498e1a31dcced"
+checksum = "499640dd6837b8a5bb7d2f33f69aa74ba4e5fb944e552e38f09864287477ab3b"
 dependencies = [
  "rustc-ap-rustc_ast",
  "rustc-ap-rustc_ast_passes",
@@ -1015,6 +1015,7 @@ dependencies = [
  "rustc-ap-rustc_errors",
  "rustc-ap-rustc_feature",
  "rustc-ap-rustc_lexer",
+ "rustc-ap-rustc_lint_defs",
  "rustc-ap-rustc_macros",
  "rustc-ap-rustc_parse",
  "rustc-ap-rustc_serialize",
@@ -1026,9 +1027,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_feature"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ac44cfab6d4dc09f93a332556cd65be67be3675179b0583b6df831d7887a77"
+checksum = "8199d34846af059ff2e387934916277fdffbed92fbbcd693df4179d4f2c51e76"
 dependencies = [
  "rustc-ap-rustc_data_structures",
  "rustc-ap-rustc_span",
@@ -1036,21 +1037,21 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_fs_util"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a6024b6e161a45c85e12950b939981e8d5235587332e9a703900e719520d8b2"
+checksum = "ce35d2a03e56e6a01f00d8e33b760363f05085859f0340d5caa39823f8cd9a44"
 
 [[package]]
 name = "rustc-ap-rustc_graphviz"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ebcdd50bf977ce1c9b6f646f50fb8677d87c8fa66796fd3f5cb9c28079515c4"
+checksum = "9626d1928e8639fe327cdfa3a4b6696de9c84ac04dd8f1d010879dba4524a8d6"
 
 [[package]]
 name = "rustc-ap-rustc_index"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51286a5d6f25a31a2f258af12ade26e3d9e579b9661e0b153deec988a86dbde8"
+checksum = "364c76daf3da8ea105daaea6a92fed6ad89a9366267f4828d1406fc39a65745b"
 dependencies = [
  "arrayvec 0.5.1",
  "rustc-ap-rustc_macros",
@@ -1059,18 +1060,18 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_lexer"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3601c20fc378d11e965fb1f670cf8bad1ef5164fe4ec8cbb7c57fa9d656f2541"
+checksum = "47cfdb02425aed8c56f85692975d262cb438ea0388e0c8cd254e73bd22bb6539"
 dependencies = [
  "unicode-xid",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_lint_defs"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d92f9f53a0f6976216bc94fd5380686d401852b8792c977ade52a6e9c3b0fcb9"
+checksum = "158d326d78e86105c934dd9bdc1fd7afcf21f41a51acb065ac7e1ecbb4663788"
 dependencies = [
  "rustc-ap-rustc_ast",
  "rustc-ap-rustc_data_structures",
@@ -1083,9 +1084,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_macros"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff03d3d0e4edadc7beee5ee825b9503741ac021ce9d25999041a0947bb3a28e8"
+checksum = "1a16139dc0677c0417bd969dc816e820f348b1a5f8d6663c7ab0b4c526c3427d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1095,9 +1096,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_parse"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e98331237f2b6e98bc239d2fc3b2b57e7299199dbd6d4bfaed9c2ef89d6c2ab"
+checksum = "b917704d699b6e5f4e9d35fcb25c8443e3229c4a3e11f4f347fbe7a964dfdbac"
 dependencies = [
  "bitflags",
  "rustc-ap-rustc_ast",
@@ -1115,9 +1116,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_serialize"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "277c75e732e238e36e3233da40be3ac865e5e076c2900a3ee3367cf1aceb90a2"
+checksum = "55b6bfa271ab3778a33d3dc9c1655d6aec7bdd02d327dd80f0fb05199801a2f9"
 dependencies = [
  "indexmap",
  "smallvec",
@@ -1125,9 +1126,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_session"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac486189586c396b4c88b744f27e3f88776f1b9d1a6c0d612db56b54df0817d4"
+checksum = "2d8bcdbf64ccca1c93ce4c1b186d680fab897d936755c1c46108335066a4b3df"
 dependencies = [
  "bitflags",
  "getopts",
@@ -1147,9 +1148,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_span"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9414e05aeef20a513b9e042c9128772bde4db8cc972d5dc2fa126ca26f548e07"
+checksum = "57c255026e999472912f5104881672003623537d5ce675d591fba38632a8b59d"
 dependencies = [
  "cfg-if 0.1.10",
  "md-5",
@@ -1167,9 +1168,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_target"
-version = "701.0.0"
+version = "702.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f447c83857779edde1b11752e480563cd798e2284e8634864d31982b8e42de6"
+checksum = "8d3def54a9c21135316cb84aca7c99439b60864e6ac72ba27934473e95d6787c"
 dependencies = [
  "bitflags",
  "rustc-ap-rustc_data_structures",
diff --git a/Cargo.toml b/Cargo.toml
index 2cb787f15b6..3f85c5a9b57 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,11 +66,11 @@ rustc-workspace-hack = "1.0.0"
 
 [dependencies.rustc_ast]
 package = "rustc-ap-rustc_ast"
-version = "701.0.0"
+version = "702.0.0"
 
 [dependencies.rustc_ast_pretty]
 package = "rustc-ap-rustc_ast_pretty"
-version = "701.0.0"
+version = "702.0.0"
 
 [dependencies.rustc_attr]
 package = "rustc-ap-rustc_attr"
@@ -78,24 +78,24 @@ version = "697.0.0"
 
 [dependencies.rustc_data_structures]
 package = "rustc-ap-rustc_data_structures"
-version = "701.0.0"
+version = "702.0.0"
 
 [dependencies.rustc_errors]
 package = "rustc-ap-rustc_errors"
-version = "701.0.0"
+version = "702.0.0"
 
 [dependencies.rustc_expand]
 package = "rustc-ap-rustc_expand"
-version = "701.0.0"
+version = "702.0.0"
 
 [dependencies.rustc_parse]
 package = "rustc-ap-rustc_parse"
-version = "701.0.0"
+version = "702.0.0"
 
 [dependencies.rustc_session]
 package = "rustc-ap-rustc_session"
-version = "701.0.0"
+version = "702.0.0"
 
 [dependencies.rustc_span]
 package = "rustc-ap-rustc_span"
-version = "701.0.0"
+version = "702.0.0"

From a0f161ad294847920844d73ff8c5892ac659e020 Mon Sep 17 00:00:00 2001
From: Caleb Cartwright <caleb.cartwright@outlook.com>
Date: Tue, 2 Feb 2021 22:01:34 -0600
Subject: [PATCH 4/5] chore: bump toolchain file

---
 rust-toolchain | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-toolchain b/rust-toolchain
index 32429dab56e..edd49109a62 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2020-12-31
+nightly-2021-02-03

From 5ca255f26872b38ba1aa55da90bd8844381070ae Mon Sep 17 00:00:00 2001
From: Caleb Cartwright <caleb.cartwright@outlook.com>
Date: Wed, 3 Feb 2021 20:27:17 -0600
Subject: [PATCH 5/5] meta: bump version to v1.4.35

---
 CHANGELOG.md | 14 +++++++++++++-
 Cargo.lock   |  2 +-
 Cargo.toml   |  4 ++--
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7c2d5fa1bc..40964b44eb0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 ## [Unreleased]
 
+## [1.4.35] 2021-02-03
+
+### Changed
+
+- `rustc-ap-*` crates updated to v702.0.0
+
+### Install/Download Options
+- **crates.io package** - *pending*
+- **rustup (nightly)** - *pending*
+- **GitHub Release Binaries** - [Release v1.4.35](https://github.com/rust-lang/rustfmt/releases/tag/v1.4.35)
+- **Build from source** - [Tag v1.4.35](https://github.com/rust-lang/rustfmt/tree/v1.4.35), see instructions for how to [install rustfmt from source][install-from-source]
+
 ## [1.4.34] 2021-01-28
 
 ### Fixed
@@ -9,7 +21,7 @@
 
 ### Install/Download Options
 - **crates.io package** - *pending*
-- **rustup (nightly)** - *pending*
+- **rustup (nightly)** - Starting in `2021-01-31`
 - **GitHub Release Binaries** - [Release v1.4.34](https://github.com/rust-lang/rustfmt/releases/tag/v1.4.34)
 - **Build from source** - [Tag v1.4.34](https://github.com/rust-lang/rustfmt/tree/v1.4.34), see instructions for how to [install rustfmt from source][install-from-source]
 
diff --git a/Cargo.lock b/Cargo.lock
index e001bde32d9..e2e8708a8c4 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1243,7 +1243,7 @@ dependencies = [
 
 [[package]]
 name = "rustfmt-nightly"
-version = "1.4.34"
+version = "1.4.35"
 dependencies = [
  "annotate-snippets 0.6.1",
  "anyhow",
diff --git a/Cargo.toml b/Cargo.toml
index 3f85c5a9b57..543bf6ad668 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustfmt-nightly"
-version = "1.4.34"
+version = "1.4.35"
 authors = ["Nicholas Cameron <ncameron@mozilla.com>", "The Rustfmt developers"]
 description = "Tool to find and fix Rust formatting issues"
 repository = "https://github.com/rust-lang/rustfmt"
@@ -74,7 +74,7 @@ version = "702.0.0"
 
 [dependencies.rustc_attr]
 package = "rustc-ap-rustc_attr"
-version = "697.0.0"
+version = "702.0.0"
 
 [dependencies.rustc_data_structures]
 package = "rustc-ap-rustc_data_structures"