Get it compiling

Author: Aaron1011

compiler/rustc_ast/src/ast_like.rs

@@ -1,5 +1,7 @@
 use super::ptr::P;
-use super::tokenstream::{LazyTokenStream, Spacing, AttributesData, PreexpTokenTree, PreexpTokenStream};
+use super::tokenstream::{
+    AttributesData, LazyTokenStream, PreexpTokenStream, PreexpTokenTree, Spacing,
+};
 use super::{Arm, Field, FieldPat, GenericParam, Param, StructField, Variant};
 use super::{AssocItem, Expr, ForeignItem, Item, Local, MacCallStmt};
 use super::{AttrItem, AttrKind, Block, Pat, Path, Ty, Visibility};
@@ -143,7 +145,6 @@ impl AstLike for Attribute {
                 panic!("Called visit_tokens on doc comment attr {:?}", self)
             }
         }
-
     }
 }
 
@@ -177,7 +178,6 @@ pub fn has_cfg_or_cfg_any(attrs: &[Attribute]) -> bool {
     })
 }
 
-
 /// Helper trait for the macros below. Abstracts over
 /// the two types of attribute fields that AST nodes
 /// may have (`Vec<Attribute>` or `AttrVec`)

compiler/rustc_expand/src/base.rs

@@ -3,7 +3,7 @@ use crate::module::DirectoryOwnership;
 
 use rustc_ast::ptr::P;
 use rustc_ast::token::{self, Nonterminal};
-use rustc_ast::tokenstream::{CanSynthesizeMissingTokens, LazyTokenStream, TokenStream};
+use rustc_ast::tokenstream::{AttributesData, CanSynthesizeMissingTokens, LazyTokenStream, TokenStream};
 use rustc_ast::visit::{AssocCtxt, Visitor};
 use rustc_ast::{self as ast, AstLike, Attribute, NodeId, PatKind};
 use rustc_attr::{self as attr, Deprecation, Stability};
@@ -45,6 +45,7 @@ pub enum Annotatable {
 }
 
 impl AstLike for Annotatable {
+    const SUPPORTS_INNER_ATTRS: bool = true;
     fn attrs(&self) -> &[Attribute] {
         match *self {
             Annotatable::Item(ref item) => &item.attrs,
@@ -81,7 +82,7 @@ impl AstLike for Annotatable {
         }
     }
 
-    fn finalize_tokens(&mut self, tokens: LazyTokenStream) {
+    fn finalize_tokens(&mut self, tokens: LazyTokenStream) -> Option<AttributesData> {
         panic!("Called finalize_tokens on an Annotatable: {:?}", tokens);
     }
 

compiler/rustc_expand/src/config.rs

@@ -5,8 +5,10 @@ use crate::base::Annotatable;
 use rustc_ast::mut_visit::*;
 use rustc_ast::ptr::P;
 use rustc_ast::token::{DelimToken, Token, TokenKind};
-use rustc_ast::tokenstream::{DelimSpan, LazyTokenStream, Spacing, TokenStream, TokenTree};
-use rustc_ast::{self as ast, AstLike, AttrItem, Attribute, MetaItem};
+use rustc_ast::tokenstream::{
+    DelimSpan, LazyTokenStream, PreexpTokenStream, PreexpTokenTree, Spacing, TokenStream, TokenTree,
+};
+use rustc_ast::{self as ast, AstLike, AttrItem, Attribute, AttrStyle, MetaItem};
 use rustc_attr as attr;
 use rustc_data_structures::fx::FxHashMap;
 use rustc_data_structures::map_in_place::MapInPlace;
@@ -268,12 +270,7 @@ impl<'a> StripUnconfigured<'a> {
         mut attrs: Vec<ast::Attribute>,
     ) -> Option<Vec<ast::Attribute>> {
         attrs.flat_map_in_place(|attr| self.process_cfg_attr(attr));
-        if self.in_cfg(&attrs) {
-            Some(attrs)
-        } else {
-            self.modified = true;
-            None
-        }
+        if self.in_cfg(&attrs) { Some(attrs) } else { None }
     }
 
     fn configure_tokens(&mut self, stream: &PreexpTokenStream) -> PreexpTokenStream {

compiler/rustc_lint/src/builtin.rs

@@ -1048,7 +1048,7 @@ impl EarlyLintPass for UnusedDocComment {
             | ast::StmtKind::MacCall(_) => return,
         };
 
-        warn_if_doc(cx, stmt.span, kind, HasAttrs::attrs(&stmt.kind));
+        warn_if_doc(cx, stmt.span, kind, stmt.kind.attrs());
     }
 
     fn check_arm(&mut self, cx: &EarlyContext<'_>, arm: &ast::Arm) {

compiler/rustc_parse/src/lib.rs

@@ -9,11 +9,11 @@
 
 use rustc_ast as ast;
 use rustc_ast::token::{self, Nonterminal, Token, TokenKind};
-use rustc_ast::AstLike;
 use rustc_ast::tokenstream::{
     self, AttributesData, CanSynthesizeMissingTokens, LazyTokenStream, PreexpTokenStream,
     PreexpTokenTree, Spacing, TokenStream,
 };
+use rustc_ast::AstLike;
 use rustc_ast::Attribute;
 use rustc_ast_pretty::pprust;
 use rustc_data_structures::sync::Lrc;

compiler/rustc_parse/src/parser/attr_wrapper.rs

@@ -230,7 +230,7 @@ impl<'a> Parser<'a> {
             && !attrs.maybe_needs_tokens()
             && !R::SUPPORTS_INNER_ATTRS
             && !(matches!(self.capture_state.capturing, Capturing::Yes { tokens_for_attrs: true })
-                && ast::attr::has_cfg_or_cfg_any(&attrs.attrs))
+                && ast::ast_like::has_cfg_or_cfg_any(&attrs.attrs))
         {
             return Ok(f(self, attrs.attrs.into())?.0);
         }
@@ -268,7 +268,7 @@ impl<'a> Parser<'a> {
             // but we only bail out if there's no possibility of inner attributes
             // (!R::SUPPORTS_INNER_ATTRS)
             && !(matches!(self.capture_state.capturing, Capturing:: Yes { tokens_for_attrs: true })
-                 && ast::attr::has_cfg_or_cfg_any(ret.attrs()))
+                 && ast::ast_like::has_cfg_or_cfg_any(ret.attrs()))
         {
             return Ok(ret);
         }
@@ -298,19 +298,17 @@ impl<'a> Parser<'a> {
 
         let num_calls = end_pos - cursor_snapshot_next_calls;
 
-        let make_lazy = || {
-            LazyTokenStream::new(LazyTokenStreamImpl {
-                start_token,
-                num_calls: num_calls.try_into().unwrap(),
-                cursor_snapshot,
-                desugar_doc_comments: self.desugar_doc_comments,
-                append_unglued_token: self.token_cursor.append_unglued_token.clone(),
-                replace_ranges: replace_ranges.into(),
-                start_calls: cursor_snapshot_next_calls.try_into().unwrap(),
-            })
-        };
-
-        let final_attrs: Option<AttributesData> = ret.finalize_tokens(make_lazy);
+        let tokens = LazyTokenStream::new(LazyTokenStreamImpl {
+            start_token,
+            num_calls: num_calls.try_into().unwrap(),
+            cursor_snapshot,
+            desugar_doc_comments: self.desugar_doc_comments,
+            append_unglued_token: self.token_cursor.append_unglued_token.clone(),
+            replace_ranges: replace_ranges.into(),
+            start_calls: cursor_snapshot_next_calls.try_into().unwrap(),
+        });
+
+        let final_attrs: Option<AttributesData> = ret.finalize_tokens(tokens);
         if let Some(final_attrs) = final_attrs {
             if matches!(self.capture_state.capturing, Capturing::Yes { tokens_for_attrs: true }) {
                 let start_pos =