Give all arguments a Span as argument

Signed-off-by: Jonathan Brouwer <[email protected]>

Author: JonathanBrouwer

compiler/rustc_attr_data_structures/src/attributes.rs

@@ -232,7 +232,7 @@ pub enum AttributeKind {
     },
 
     /// Represents `#[rustc_const_stable_indirect]`.
-    ConstStabilityIndirect,
+    ConstStabilityIndirect(Span),
 
     /// Represents [`#[deprecated]`](https://doc.rust-lang.org/stable/reference/attributes/diagnostics.html#the-deprecated-attribute).
     Deprecation { deprecation: Deprecation, span: Span },
@@ -241,7 +241,7 @@ pub enum AttributeKind {
     DocComment { style: AttrStyle, kind: CommentKind, span: Span, comment: Symbol },
 
     /// Represents `#[rustc_dummy]`.
-    Dummy,
+    Dummy(Span),
 
     /// Represents [`#[export_name]`](https://doc.rust-lang.org/reference/abi.html#the-export_name-attribute).
     ExportName {
@@ -252,7 +252,7 @@ pub enum AttributeKind {
     },
 
     /// Represents `#[export_stable]`.
-    ExportStable,
+    ExportStable(Span),
 
     /// Represents `#[ffi_const]`.
     FfiConst(Span),
@@ -280,7 +280,7 @@ pub enum AttributeKind {
     LoopMatch(Span),
 
     /// Represents `#[rustc_macro_transparency]`.
-    MacroTransparency(Transparency),
+    MacroTransparency(Transparency, Span),
 
     /// Represents [`#[may_dangle]`](https://std-dev-guide.rust-lang.org/tricky/may-dangle.html).
     MayDangle(Span),
@@ -326,7 +326,7 @@ pub enum AttributeKind {
     RustcLayoutScalarValidRangeStart(Box<u128>, Span),
 
     /// Represents `#[rustc_object_lifetime_default]`.
-    RustcObjectLifetimeDefault,
+    RustcObjectLifetimeDefault(Span),
 
     /// Represents `#[rustc_skip_during_method_dispatch]`.
     SkipDuringMethodDispatch { array: bool, boxed_slice: bool, span: Span },

compiler/rustc_attr_data_structures/src/encode_cross_crate.rs

@@ -22,12 +22,12 @@ impl AttributeKind {
             Confusables { .. } => Yes,
             ConstContinue(..) => No,
             ConstStability { .. } => Yes,
-            ConstStabilityIndirect => No,
+            ConstStabilityIndirect(..) => No,
             Deprecation { .. } => Yes,
             DocComment { .. } => Yes,
-            Dummy => No,
+            Dummy(..) => No,
             ExportName { .. } => Yes,
-            ExportStable => No,
+            ExportStable(..) => No,
             FfiConst(..) => No,
             FfiPure(..) => No,
             Ignore { .. } => No,
@@ -49,7 +49,7 @@ impl AttributeKind {
             Repr { .. } => No,
             RustcLayoutScalarValidRangeEnd(..) => Yes,
             RustcLayoutScalarValidRangeStart(..) => Yes,
-            RustcObjectLifetimeDefault => No,
+            RustcObjectLifetimeDefault(..) => No,
             SkipDuringMethodDispatch { .. } => No,
             Stability { .. } => Yes,
             StdInternalSymbol(..) => No,

compiler/rustc_attr_parsing/src/attributes/dummy.rs

@@ -13,7 +13,7 @@ impl<S: Stage> SingleAttributeParser<S> for DummyParser {
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Ignore;
     const TEMPLATE: AttributeTemplate = template!(Word); // Anything, really
 
-    fn convert(_: &mut AcceptContext<'_, '_, S>, _: &ArgParser<'_>) -> Option<AttributeKind> {
-        Some(AttributeKind::Dummy)
+    fn convert(cx: &mut AcceptContext<'_, '_, S>, _: &ArgParser<'_>) -> Option<AttributeKind> {
+        Some(AttributeKind::Dummy(cx.attr_span))
     }
 }

compiler/rustc_attr_parsing/src/attributes/link_attrs.rs

@@ -64,7 +64,7 @@ pub(crate) struct ExportStableParser;
 impl<S: Stage> NoArgsAttributeParser<S> for ExportStableParser {
     const PATH: &[Symbol] = &[sym::export_stable];
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Warn;
-    const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::ExportStable;
+    const CREATE: fn(Span) -> AttributeKind = AttributeKind::ExportStable;
 }
 
 pub(crate) struct FfiConstParser;

compiler/rustc_attr_parsing/src/attributes/rustc_internal.rs

@@ -72,6 +72,6 @@ impl<S: Stage> SingleAttributeParser<S> for RustcObjectLifetimeDefaultParser {
             return None;
         }
 
-        Some(AttributeKind::RustcObjectLifetimeDefault)
+        Some(AttributeKind::RustcObjectLifetimeDefault(cx.attr_span))
     }
 }

compiler/rustc_attr_parsing/src/attributes/stability.rs

@@ -136,7 +136,7 @@ pub(crate) struct ConstStabilityIndirectParser;
 impl<S: Stage> NoArgsAttributeParser<S> for ConstStabilityIndirectParser {
     const PATH: &[Symbol] = &[sym::rustc_const_stable_indirect];
     const ON_DUPLICATE: OnDuplicate<S> = OnDuplicate::Ignore;
-    const CREATE: fn(Span) -> AttributeKind = |_| AttributeKind::ConstStabilityIndirect;
+    const CREATE: fn(Span) -> AttributeKind = AttributeKind::ConstStabilityIndirect;
 }
 
 #[derive(Default)]

compiler/rustc_attr_parsing/src/attributes/transparency.rs

@@ -39,6 +39,6 @@ impl<S: Stage> SingleAttributeParser<S> for TransparencyParser {
             }
             None => None,
         }
-        .map(AttributeKind::MacroTransparency)
+        .map(|t| AttributeKind::MacroTransparency(t, cx.attr_span))
     }
 }

compiler/rustc_expand/src/mbe/macro_rules.rs

@@ -429,7 +429,7 @@ pub fn compile_declarative_macro(
         return dummy_syn_ext(guar);
     }
 
-    let transparency = find_attr!(attrs, AttributeKind::MacroTransparency(x) => *x)
+    let transparency = find_attr!(attrs, AttributeKind::MacroTransparency(x, _) => *x)
         .unwrap_or(Transparency::fallback(macro_rules));
 
     if let Some(guar) = guar {

compiler/rustc_passes/src/check_attr.rs

@@ -162,7 +162,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
                 }
                 Attribute::Parsed(AttributeKind::Repr { .. }) => { /* handled below this loop and elsewhere */
                 }
-                Attribute::Parsed(AttributeKind::RustcObjectLifetimeDefault) => {
+                Attribute::Parsed(AttributeKind::RustcObjectLifetimeDefault(..)) => {
                     self.check_object_lifetime_default(hir_id);
                 }
                 &Attribute::Parsed(AttributeKind::PubTransparent(attr_span)) => {
@@ -204,7 +204,7 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
                     AttributeKind::RustcLayoutScalarValidRangeStart(_num, attr_span)
                     | AttributeKind::RustcLayoutScalarValidRangeEnd(_num, attr_span),
                 ) => self.check_rustc_layout_scalar_valid_range(*attr_span, span, target),
-                Attribute::Parsed(AttributeKind::ExportStable) => {
+                Attribute::Parsed(AttributeKind::ExportStable(..)) => {
                     // handled in `check_export`
                 }
                 &Attribute::Parsed(AttributeKind::FfiConst(attr_span)) => {
@@ -215,9 +215,9 @@ impl<'tcx> CheckAttrVisitor<'tcx> {
                 }
                 Attribute::Parsed(
                     AttributeKind::BodyStability { .. }
-                    | AttributeKind::ConstStabilityIndirect
-                    | AttributeKind::MacroTransparency(_)
-                    | AttributeKind::Dummy,
+                    | AttributeKind::ConstStabilityIndirect(..)
+                    | AttributeKind::MacroTransparency(..)
+                    | AttributeKind::Dummy(..),
                 ) => { /* do nothing  */ }
                 Attribute::Parsed(AttributeKind::AsPtr(attr_span)) => {
                     self.check_applied_to_fn_or_method(hir_id, *attr_span, span, target)

compiler/rustc_passes/src/check_export.rs

@@ -45,7 +45,7 @@ impl<'tcx> ExportableItemCollector<'tcx> {
     }
 
     fn item_is_exportable(&self, def_id: LocalDefId) -> bool {
-        let has_attr = find_attr!(self.tcx.get_all_attrs(def_id), AttributeKind::ExportStable);
+        let has_attr = find_attr!(self.tcx.get_all_attrs(def_id), AttributeKind::ExportStable(..));
         if !self.in_exportable_mod && !has_attr {
             return false;
         }
@@ -81,7 +81,7 @@ impl<'tcx> ExportableItemCollector<'tcx> {
     fn walk_item_with_mod(&mut self, item: &'tcx hir::Item<'tcx>) {
         let def_id = item.hir_id().owner.def_id;
         let old_exportable_mod = self.in_exportable_mod;
-        if find_attr!(self.tcx.get_all_attrs(def_id), AttributeKind::ExportStable) {
+        if find_attr!(self.tcx.get_all_attrs(def_id), AttributeKind::ExportStable(..)) {
             self.in_exportable_mod = true;
         }
         let old_seen_exportable_in_mod = std::mem::replace(&mut self.seen_exportable_in_mod, false);