Remove Span from hir::ImplItemRef.

Author: cjgillot

compiler/rustc_ast_lowering/src/item.rs

@@ -948,7 +948,6 @@ impl<'hir> LoweringContext<'_, 'hir> {
         hir::ImplItemRef {
             id: hir::ImplItemId { 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)),
             defaultness,
             kind: match &i.kind {

compiler/rustc_hir/src/hir.rs

@@ -2838,7 +2838,6 @@ pub struct ImplItemRef<'hir> {
     #[stable_hasher(project(name))]
     pub ident: Ident,
     pub kind: AssocItemKind,
-    pub span: Span,
     pub vis: Visibility<'hir>,
     pub defaultness: Defaultness,
 }

compiler/rustc_hir/src/intravisit.rs

@@ -1000,7 +1000,7 @@ pub fn walk_foreign_item_ref<'v, V: Visitor<'v>>(
 
 pub fn walk_impl_item_ref<'v, V: Visitor<'v>>(visitor: &mut V, impl_item_ref: &'v ImplItemRef<'v>) {
     // N.B., deliberately force a compilation error if/when new fields are added.
-    let ImplItemRef { id, ident, ref kind, span: _, ref vis, ref defaultness } = *impl_item_ref;
+    let ImplItemRef { id, ident, ref kind, ref vis, ref defaultness } = *impl_item_ref;
     visitor.visit_nested_impl_item(id);
     visitor.visit_ident(ident);
     visitor.visit_associated_item_kind(kind);

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

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

compiler/rustc_middle/src/ty/error.rs

@@ -852,7 +852,8 @@ fn foo(&self) -> Self::T { String::new() }
                 for item in &items[..] {
                     if let hir::AssocItemKind::Type = item.kind {
                         if self.type_of(item.id.def_id) == found {
-                            db.span_label(item.span, "expected this associated type");
+                            let item_span = self.hir().span(item.id.hir_id());
+                            db.span_label(item_span, "expected this associated type");
                             return true;
                         }
                     }

compiler/rustc_trait_selection/src/traits/wf.rs

@@ -205,7 +205,7 @@ fn extend_cause_with_original_assoc_item_obligation<'tcx>(
     let fix_span =
         |impl_item_ref: &hir::ImplItemRef<'_>| match tcx.hir().impl_item(impl_item_ref.id).kind {
             hir::ImplItemKind::Const(ty, _) | hir::ImplItemKind::TyAlias(ty) => ty.span,
-            _ => impl_item_ref.span,
+            _ => tcx.hir().span(impl_item_ref.id.hir_id()),
         };
 
     // It is fine to skip the binder as we don't care about regions here.

src/tools/clippy/clippy_lints/src/partialeq_ne_impl.rs

@@ -46,7 +46,7 @@ impl<'tcx> LateLintPass<'tcx> for PartialEqNeImpl {
                             cx,
                             PARTIALEQ_NE_IMPL,
                             impl_item.id.hir_id(),
-                            impl_item.span,
+                            cx.tcx.hir().span_with_body(impl_item.id.hir_id()),
                             "re-implementing `PartialEq::ne` is unnecessary",
                         );
                     }

src/tools/clippy/clippy_lints/src/serde_api.rs

@@ -35,8 +35,8 @@ impl<'tcx> LateLintPass<'tcx> for SerdeApi {
                     let mut seen_string = None;
                     for item in items {
                         match &*item.ident.as_str() {
-                            "visit_str" => seen_str = Some(item.span),
-                            "visit_string" => seen_string = Some(item.span),
+                            "visit_str" => seen_str = Some(cx.tcx.hir().span_with_body(item.id.hir_id())),
+                            "visit_string" => seen_string = Some(cx.tcx.hir().span_with_body(item.id.hir_id())),
                             _ => {},
                         }
                     }