Remove span from hir::MacroDef.

Author: cjgillot

src/librustc_ast_lowering/item.rs

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

src/librustc_hir/hir.rs

@@ -725,7 +725,6 @@ pub struct MacroDef<'hir> {
     pub vis: Visibility<'hir>,
     pub attrs: &'hir [Attribute],
     pub hir_id: HirId,
-    pub span: Span,
     pub ast: ast::MacroDef,
 }
 

src/librustc_lint/builtin.rs

@@ -412,9 +412,10 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for MissingDoc {
         for macro_def in krate.exported_macros {
             let has_doc = macro_def.attrs.iter().any(|a| has_doc(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(),
                 );
             }

src/librustc_metadata/rmeta/encoder.rs

@@ -1304,9 +1304,10 @@ impl EncodeContext<'tcx> {
     /// Serialize the text of exported macros
     fn encode_info_for_macro_def(&mut self, macro_def: &hir::MacroDef<'_>) {
         let def_id = self.tcx.hir().local_def_id(macro_def.hir_id).to_def_id();
+        let span = self.tcx.hir().span(macro_def.hir_id);
         record!(self.tables.kind[def_id] <- EntryKind::MacroDef(self.lazy(macro_def.ast.clone())));
         record!(self.tables.visibility[def_id] <- ty::Visibility::Public);
-        record!(self.tables.span[def_id] <- macro_def.span);
+        record!(self.tables.span[def_id] <- span);
         record!(self.tables.attributes[def_id] <- macro_def.attrs);
         self.encode_ident_span(def_id, macro_def.ident);
         self.encode_stability(def_id);

src/librustc_middle/hir/map/collector.rs

@@ -515,12 +515,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
 
     fn visit_macro_def(&mut self, macro_def: &'hir MacroDef<'hir>) {
         self.with_dep_node_owner(macro_def.hir_id.owner, macro_def, |this, hash| {
-            this.insert_with_hash(
-                macro_def.span,
-                macro_def.hir_id,
-                Node::MacroDef(macro_def),
-                hash,
-            );
+            this.insert_with_hash(DUMMY_SP, macro_def.hir_id, Node::MacroDef(macro_def), hash);
         });
     }
 

src/librustc_passes/stability.rs

@@ -329,7 +329,8 @@ impl<'a, 'tcx> Visitor<'tcx> for Annotator<'a, 'tcx> {
     }
 
     fn visit_macro_def(&mut self, md: &'tcx hir::MacroDef<'tcx>) {
-        self.annotate(md.hir_id, &md.attrs, md.span, AnnotationKind::Required, |_| {});
+        let span = self.tcx.hir().span(md.hir_id);
+        self.annotate(md.hir_id, &md.attrs, span, AnnotationKind::Required, |_| {});
     }
 }
 
@@ -403,7 +404,8 @@ impl<'a, 'tcx> Visitor<'tcx> for MissingStabilityAnnotations<'a, '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);
     }
 }
 

src/librustc_privacy/lib.rs

@@ -242,7 +242,8 @@ fn def_id_visibility<'tcx>(
                 Node::ForeignItem(foreign_item) => &foreign_item.vis,
                 Node::MacroDef(macro_def) => {
                     if attr::contains_name(&macro_def.attrs, sym::macro_export) {
-                        return (ty::Visibility::Public, macro_def.span, "public");
+                        let span = tcx.hir().span(macro_def.hir_id);
+                        return (ty::Visibility::Public, span, "public");
                     } else {
                         &macro_def.vis
                     }

src/librustdoc/test.rs

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

src/librustdoc/visit_ast.rs

@@ -618,7 +618,7 @@ impl<'a, 'tcx> RustdocVisitor<'a, 'tcx> {
             def_id: self.cx.tcx.hir().local_def_id(def.hir_id).to_def_id(),
             attrs: &def.attrs,
             name: renamed.unwrap_or(def.ident.name),
-            whence: def.span,
+            whence: self.cx.tcx.hir().span(def.hir_id),
             matchers,
             imported_from: None,
         }