Remove span from hir::MacroDef.

Author: cjgillot

compiler/rustc_ast_lowering/src/item.rs

@@ -226,7 +226,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
                     ident,
                     vis,
                     def_id: hir_id.expect_owner(),
-                    span: i.span,
                     ast: MacroDef { body, macro_rules },
                 });
             } else {

compiler/rustc_hir/src/hir.rs

@@ -772,7 +772,6 @@ pub struct MacroDef<'hir> {
     pub ident: Ident,
     pub vis: Visibility<'hir>,
     pub def_id: LocalDefId,
-    pub span: Span,
     pub ast: ast::MacroDef,
 }
 

compiler/rustc_hir/src/stable_hash_impls.rs

@@ -194,13 +194,12 @@ impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for Item<'_> {
 
 impl<HirCtx: crate::HashStableContext> HashStable<HirCtx> for MacroDef<'_> {
     fn hash_stable(&self, hcx: &mut HirCtx, hasher: &mut StableHasher) {
-        let MacroDef { ident, def_id: _, ref ast, ref vis, span } = *self;
+        let MacroDef { ident, def_id: _, ref ast, ref vis } = *self;
 
         hcx.hash_hir_item_like(|hcx| {
             ident.name.hash_stable(hcx, hasher);
             ast.hash_stable(hcx, hasher);
             vis.hash_stable(hcx, hasher);
-            span.hash_stable(hcx, hasher);
         });
     }
 }

compiler/rustc_lint/src/builtin.rs

@@ -572,9 +572,10 @@ impl<'tcx> LateLintPass<'tcx> for MissingDoc {
             let attrs = cx.tcx.hir().attrs(macro_def.hir_id());
             let has_doc = attrs.iter().any(|a| has_doc(cx.sess(), a));
             if !has_doc {
+                let span = cx.tcx.hir().span(macro_def.hir_id());
                 cx.struct_span_lint(
                     MISSING_DOCS,
-                    cx.tcx.sess.source_map().guess_head_span(macro_def.span),
+                    cx.tcx.sess.source_map().guess_head_span(span),
                     |lint| lint.build("missing documentation for macro").emit(),
                 );
             }

compiler/rustc_passes/src/check_attr.rs

@@ -1288,7 +1288,8 @@ impl Visitor<'tcx> for CheckAttrVisitor<'tcx> {
     }
 
     fn visit_macro_def(&mut self, macro_def: &'tcx hir::MacroDef<'tcx>) {
-        self.check_attributes(macro_def.hir_id(), &macro_def.span, Target::MacroDef, None);
+        let span = self.tcx.hir().span(macro_def.hir_id());
+        self.check_attributes(macro_def.hir_id(), &span, Target::MacroDef, None);
         intravisit::walk_macro_def(self, macro_def);
     }
 

compiler/rustc_passes/src/stability.rs

@@ -496,9 +496,10 @@ impl<'a, 'tcx> Visitor<'tcx> for Annotator<'a, 'tcx> {
     }
 
     fn visit_macro_def(&mut self, md: &'tcx hir::MacroDef<'tcx>) {
+        let span = self.tcx.hir().span(md.hir_id());
         self.annotate(
             md.hir_id(),
-            md.span,
+            span,
             AnnotationKind::Required,
             InheritDeprecation::Yes,
             InheritConstStability::No,
@@ -625,7 +626,8 @@ impl<'tcx> Visitor<'tcx> for MissingStabilityAnnotations<'tcx> {
     }
 
     fn visit_macro_def(&mut self, md: &'tcx hir::MacroDef<'tcx>) {
-        self.check_missing_stability(md.hir_id(), md.span);
+        let span = self.tcx.hir().span(md.hir_id());
+        self.check_missing_stability(md.hir_id(), span);
     }
 
     // Note that we don't need to `check_missing_stability` for default generic parameters,

src/librustdoc/doctest.rs

@@ -1100,7 +1100,7 @@ impl<'a, 'hir, 'tcx> intravisit::Visitor<'hir> for HirCollector<'a, 'hir, 'tcx>
         self.visit_testable(
             macro_def.ident.to_string(),
             macro_def.hir_id(),
-            macro_def.span,
+            self.map.span(macro_def.hir_id()),
             |_| (),
         );
     }