deps: bump rustc-ap crates

Author: calebcartwright

Cargo.lock

@@ -107,32 +107,32 @@ lazy_static = "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_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"

Cargo.toml

@@ -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},
@@ -137,7 +137,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::Yes),
         |x: Option<ptr::P<ast::Item>>| x
     );
 
@@ -1503,7 +1503,7 @@ fn format_lazy_static(
         parser.eat(&TokenKind::Colon);
         let ty = parse_or!(parse_ty);
         parser.eat(&TokenKind::Eq);
-        let expr = parse_or!(parse_stmt)?;
+        let expr = parse_or!(parse_stmt, ForceCollect::Yes)?;
         parser.eat(&TokenKind::Semi);
 
         // Rewrite as a static item.

src/formatting/macros.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::formatting::attr::first_attr_value_str_by_name;
@@ -246,7 +249,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::Yes) {
                     Ok(Some(item_ptr)) => item_ptr.into_inner(),
                     Ok(None) => continue,
                     Err(mut err) => {