Bump rustc-ap crates

This also requires bumping the nightly toolchain version, since the
latest versions of the rustc-ap crates require some new nightly
features.

Cargo.toml

@@ -107,32 +107,32 @@ lazy_static = "1.0.0"
 
 [dependencies.rustc_ast]
 package = "rustc-ap-rustc_ast"
-version = "712.0.0"
+version = "717.0.0"
 
 [dependencies.rustc_ast_pretty]
 package = "rustc-ap-rustc_ast_pretty"
-version = "712.0.0"
+version = "717.0.0"
 
 [dependencies.rustc_data_structures]
 package = "rustc-ap-rustc_data_structures"
-version = "712.0.0"
+version = "717.0.0"
 
 [dependencies.rustc_errors]
 package = "rustc-ap-rustc_errors"
-version = "712.0.0"
+version = "717.0.0"
 
 [dependencies.rustc_expand]
 package = "rustc-ap-rustc_expand"
-version = "712.0.0"
+version = "717.0.0"
 
 [dependencies.rustc_parse]
 package = "rustc-ap-rustc_parse"
-version = "712.0.0"
+version = "717.0.0"
 
 [dependencies.rustc_session]
 package = "rustc-ap-rustc_session"
-version = "712.0.0"
+version = "717.0.0"
 
 [dependencies.rustc_span]
 package = "rustc-ap-rustc_span"
-version = "712.0.0"
+version = "717.0.0"

rust-toolchain

@@ -1 +1 @@
-nightly-2021-03-26
+nightly-2021-04-26

src/formatting/macros.rs

@@ -13,7 +13,7 @@ use std::collections::HashMap;
 use std::panic::{catch_unwind, AssertUnwindSafe};
 
 use rustc_ast::token::{BinOpToken, DelimToken, Token, TokenKind};
-use rustc_ast::tokenstream::{Cursor, LazyTokenStream, TokenStream, TokenTree};
+use rustc_ast::tokenstream::{Cursor, Spacing, TokenStream, TokenTree};
 use rustc_ast::{ast, ptr};
 use rustc_ast_pretty::pprust;
 use rustc_parse::parser::{ForceCollect, Parser};
@@ -1233,7 +1233,7 @@ pub(crate) fn convert_try_mac(
             kind: ast::ExprKind::Try(kind),
             span: mac.span(), // incorrect span, but shouldn't matter too much
             attrs: ast::AttrVec::new(),
-            tokens: Some(LazyTokenStream::new(ts)),
+            tokens: None,
         })
     } else {
         None
@@ -1284,7 +1284,7 @@ impl MacroParser {
             TokenTree::Token(..) => return None,
             TokenTree::Delimited(delimited_span, d, _) => (delimited_span.open.lo(), d),
         };
-        let args = tok.joint();
+        let args = TokenStream::new(vec![(tok, Spacing::Joint)]);
         match self.toks.next()? {
             TokenTree::Token(Token {
                 kind: TokenKind::FatArrow,

src/formatting/modules.rs

@@ -100,6 +100,7 @@ impl<'a> Module<'a> {
 }
 
 impl<'a> AstLike for Module<'a> {
+    const SUPPORTS_CUSTOM_INNER_ATTRS: bool = true;
     fn attrs(&self) -> &[ast::Attribute] {
         &self.inner_attr
     }