propagate default

Author: jdonszelmann

compiler/rustc_ast/src/ast.rs

@@ -1874,11 +1874,11 @@ pub struct MacroDef {
     /// `true` if macro was defined with `macro_rules`.
     pub macro_rules: bool,
 
-    pub eii_macro_for: Option<EiiMacroFor>,
+    pub eii_macro_for: Option<EIIMacroFor>,
 }
 
 #[derive(Clone, Encodable, Decodable, Debug, HashStable_Generic)]
-pub struct EiiMacroFor {
+pub struct EIIMacroFor {
     pub extern_item_path: Path,
     pub impl_unsafe: bool,
 }
@@ -3518,6 +3518,7 @@ pub struct EIIImpl {
     pub impl_safety: Safety,
     pub span: Span,
     pub inner_span: Span,
+    pub is_default: bool,
 }
 
 #[derive(Clone, Encodable, Decodable, Debug)]

compiler/rustc_ast/src/mut_visit.rs

@@ -751,7 +751,7 @@ fn walk_mac<T: MutVisitor>(vis: &mut T, mac: &mut MacCall) {
 
 fn walk_macro_def<T: MutVisitor>(vis: &mut T, macro_def: &mut MacroDef) {
     let MacroDef { body, macro_rules: _, eii_macro_for } = macro_def;
-    if let Some(EiiMacroFor { extern_item_path, impl_unsafe: _ }) = eii_macro_for {
+    if let Some(EIIMacroFor { extern_item_path, impl_unsafe: _ }) = eii_macro_for {
         vis.visit_path(extern_item_path);
     }
     visit_delim_args(vis, body);

compiler/rustc_ast/src/visit.rs

@@ -460,7 +460,7 @@ impl WalkItemKind for ItemKind {
             ItemKind::MacCall(mac) => try_visit!(visitor.visit_mac_call(mac)),
             ItemKind::MacroDef(ts) => {
                 try_visit!(visitor.visit_mac_def(ts, id));
-                if let Some(EiiMacroFor { extern_item_path, impl_unsafe: _ }) = &ts.eii_macro_for {
+                if let Some(EIIMacroFor { extern_item_path, impl_unsafe: _ }) = &ts.eii_macro_for {
                     try_visit!(visitor.visit_path(extern_item_path, id));
                 }
             }

compiler/rustc_ast_lowering/src/item.rs

@@ -157,7 +157,15 @@ impl<'hir> LoweringContext<'_, 'hir> {
         match i {
             ItemKind::Fn(box Fn { eii_impl, .. }) => {
                 let mut eii_impls = ThinVec::new();
-                for EIIImpl { node_id, eii_macro_path, impl_safety, span, inner_span } in eii_impl {
+                for EIIImpl {
+                    node_id,
+                    eii_macro_path,
+                    impl_safety,
+                    span,
+                    inner_span,
+                    is_default,
+                } in eii_impl
+                {
                     let did = self.lower_path_simple_eii(*node_id, eii_macro_path);
                     eii_impls.push(rustc_attr_parsing::EIIImpl {
                         eii_macro: did,
@@ -166,13 +174,14 @@ impl<'hir> LoweringContext<'_, 'hir> {
                         impl_marked_unsafe: self
                             .lower_safety(*impl_safety, hir::Safety::Safe)
                             .is_unsafe(),
+                        is_default: *is_default,
                     })
                 }
 
                 vec![hir::Attribute::Parsed(AttributeKind::EiiImpl(eii_impls))]
             }
             ItemKind::MacroDef(MacroDef {
-                eii_macro_for: Some(EiiMacroFor { extern_item_path, impl_unsafe }),
+                eii_macro_for: Some(EIIMacroFor { extern_item_path, impl_unsafe }),
                 ..
             }) => {
                 vec![hir::Attribute::Parsed(AttributeKind::EiiMacroFor {

compiler/rustc_attr_data_structures/src/attributes.rs

@@ -145,6 +145,7 @@ pub struct EIIImpl {
     pub impl_marked_unsafe: bool,
     pub span: Span,
     pub inner_span: Span,
+    pub is_default: bool,
 }
 
 /// Represent parsed, *built in*, inert attributes.

compiler/rustc_builtin_macros/src/eii.rs

@@ -1,7 +1,10 @@
-use rustc_ast::{DUMMY_NODE_ID, EIIImpl, EiiMacroFor, ItemKind, ast};
+use rustc_ast::{
+    DUMMY_NODE_ID, DUMMY_NODE_ID, EIIImpl, EIIImpl, EIIMacroFor, EiiMacroFor, ItemKind, ItemKind,
+    ast, ast,
+};
 use rustc_ast_pretty::pprust::path_to_string;
 use rustc_expand::base::{Annotatable, ExtCtxt};
-use rustc_span::{Span, kw};
+use rustc_span::{Span, Span, kw, kw};
 
 use crate::errors::{
     EIIMacroExpectedFunction, EIIMacroExpectedMaxOneArgument, EIIMacroForExpectedList,
@@ -50,7 +53,7 @@ pub(crate) fn eii_macro_for(
         false
     };
 
-    d.eii_macro_for = Some(EiiMacroFor { extern_item_path, impl_unsafe });
+    d.eii_macro_for = Some(EIIMacroFor { extern_item_path, impl_unsafe });
 
     // Return the original item and the new methods.
     vec![item]
@@ -94,8 +97,8 @@ pub(crate) fn eii_macro(
         eii_macro_path: meta_item.path.clone(),
         impl_safety: meta_item.unsafety,
         span,
-        inner_span: meta_item.span,
-        is_default: false,
+        inner_span: meta_item.path.span,
+        is_default,
     });
 
     vec![item]

compiler/rustc_passes/src/check_attr.rs

@@ -467,7 +467,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
         _target_span: Span,
         target: Target,
     ) {
-        for EIIImpl { span, inner_span, eii_macro, impl_marked_unsafe } in impls {
+        for EIIImpl { span, inner_span, eii_macro, impl_marked_unsafe, is_default: _ } in impls {
             match target {
                 Target::Fn => {}
                 _ => {

compiler/rustc_resolve/src/late.rs

@@ -2843,7 +2843,7 @@ impl<'a, 'ast, 'ra: 'ast, 'tcx> LateResolutionVisitor<'a, 'ast, 'ra, 'tcx> {
                     self.parent_scope.macro_rules = self.r.macro_rules_scopes[&def_id];
                 }
 
-                if let Some(EiiMacroFor { extern_item_path, impl_unsafe: _ }) =
+                if let Some(EIIMacroFor { extern_item_path, impl_unsafe: _ }) =
                     &macro_def.eii_macro_for
                 {
                     self.smart_resolve_path(