Remove span from hir::ForeignItemRef.

Author: cjgillot

compiler/rustc_ast_lowering/src/item.rs

@@ -738,7 +738,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
         hir::ForeignItemRef {
             id: hir::ForeignItemId { def_id: self.lower_node_id(i.id, i.span).expect_owner() },
             ident: i.ident,
-            span: i.span,
             vis: self.lower_visibility(&i.vis, Some(i.id)),
         }
     }

compiler/rustc_hir/src/hir.rs

@@ -2876,7 +2876,6 @@ pub struct ForeignItemRef<'hir> {
     pub id: ForeignItemId,
     #[stable_hasher(project(name))]
     pub ident: Ident,
-    pub span: Span,
     pub vis: Visibility<'hir>,
 }
 

compiler/rustc_hir/src/intravisit.rs

@@ -992,7 +992,7 @@ pub fn walk_foreign_item_ref<'v, V: Visitor<'v>>(
     foreign_item_ref: &'v ForeignItemRef<'v>,
 ) {
     // N.B., deliberately force a compilation error if/when new fields are added.
-    let ForeignItemRef { id, ident, span: _, ref vis } = *foreign_item_ref;
+    let ForeignItemRef { id, ident, ref vis } = *foreign_item_ref;
     visitor.visit_nested_foreign_item(id);
     visitor.visit_ident(ident);
     visitor.visit_vis(vis);

compiler/rustc_middle/src/hir/map/collector.rs

@@ -564,7 +564,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
     fn visit_foreign_item_ref(&mut self, fi: &'hir ForeignItemRef<'hir>) {
         // Do not visit the duplicate information in ForeignItemRef. We want to
         // map the actual nodes, not the duplicate ones in the *Ref.
-        let ForeignItemRef { id, ident: _, span: _, vis: _ } = *fi;
+        let ForeignItemRef { id, ident: _, vis: _ } = *fi;
 
         self.visit_nested_foreign_item(id);
     }

compiler/rustc_typeck/src/check/check.rs

@@ -814,14 +814,15 @@ pub fn check_item_type<'tcx>(tcx: TyCtxt<'tcx>, it: &'tcx hir::Item<'tcx>) {
                             (0, _) => ("const", "consts", None),
                             _ => ("type or const", "types or consts", None),
                         };
+                        let item_span = tcx.hir().span(item.id.hir_id());
                         struct_span_err!(
                             tcx.sess,
-                            item.span,
+                            item_span,
                             E0044,
                             "foreign items may not have {} parameters",
                             kinds,
                         )
-                        .span_label(item.span, &format!("can't have {} parameters", kinds))
+                        .span_label(item_span, &format!("can't have {} parameters", kinds))
                         .help(
                             // FIXME: once we start storing spans for type arguments, turn this
                             // into a suggestion.