Remove Span from hir::TraitItemRef.

Author: cjgillot

compiler/rustc_ast_lowering/src/item.rs

@@ -850,7 +850,7 @@ impl<'hir> LoweringContext<'_, 'hir> {
         };
         let id = hir::TraitItemId { hir_id: self.lower_node_id(i.id, i.span) };
         let defaultness = hir::Defaultness::Default { has_value: has_default };
-        hir::TraitItemRef { id, ident: i.ident, span: i.span, defaultness, kind }
+        hir::TraitItemRef { id, ident: i.ident, defaultness, kind }
     }
 
     /// Construct `ExprKind::Err` for the given `span`.

compiler/rustc_hir/src/hir.rs

@@ -2581,7 +2581,6 @@ pub struct TraitItemRef {
     #[stable_hasher(project(name))]
     pub ident: Ident,
     pub kind: AssocItemKind,
-    pub span: Span,
     pub defaultness: Defaultness,
 }
 

compiler/rustc_hir/src/intravisit.rs

@@ -962,7 +962,7 @@ pub fn walk_trait_item<'v, V: Visitor<'v>>(visitor: &mut V, trait_item: &'v Trai
 
 pub fn walk_trait_item_ref<'v, V: Visitor<'v>>(visitor: &mut V, trait_item_ref: &'v TraitItemRef) {
     // N.B., deliberately force a compilation error if/when new fields are added.
-    let TraitItemRef { id, ident, ref kind, span: _, ref defaultness } = *trait_item_ref;
+    let TraitItemRef { id, ident, ref kind, ref defaultness } = *trait_item_ref;
     visitor.visit_nested_trait_item(id);
     visitor.visit_ident(ident);
     visitor.visit_associated_item_kind(kind);

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

@@ -566,7 +566,7 @@ impl<'a, 'hir> Visitor<'hir> for NodeCollector<'a, 'hir> {
     fn visit_trait_item_ref(&mut self, ii: &'hir TraitItemRef) {
         // Do not visit the duplicate information in TraitItemRef. We want to
         // map the actual nodes, not the duplicate ones in the *Ref.
-        let TraitItemRef { id, ident: _, kind: _, span: _, defaultness: _ } = *ii;
+        let TraitItemRef { id, ident: _, kind: _, defaultness: _ } = *ii;
 
         self.visit_nested_trait_item(id);
     }

compiler/rustc_middle/src/ty/error.rs

@@ -816,7 +816,7 @@ fn foo(&self) -> Self::T { String::new() }
                             {
                                 if self.type_of(self.hir().local_def_id(item.id.hir_id)) == found {
                                     db.span_label(
-                                        item.span,
+                                        self.hir().span(item.id.hir_id),
                                         "associated type defaults can't be assumed inside the \
                                             trait defining them",
                                     );