Remove Span from hir::TypeBinding.

Author: cjgillot

compiler/rustc_ast_lowering/src/lib.rs

@@ -1262,7 +1262,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             ident: constraint.ident,
             gen_args,
             kind,
-            span: constraint.span,
         }
     }
 

compiler/rustc_ast_lowering/src/path.rs

@@ -268,7 +268,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             .args
             .first()
             .map(|a| self.spans[a.id()])
-            .or_else(|| generic_args.bindings.first().map(|b| b.span));
+            .or_else(|| generic_args.bindings.first().map(|b| self.spans[b.hir_id]));
         if !generic_args.parenthesized && !has_lifetimes {
             generic_args.args = self
                 .elided_path_lifetimes(
@@ -428,6 +428,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
         let args = arena_vec![self;];
         let bindings = arena_vec![self;];
         let gen_args = self.arena.alloc(hir::GenericArgs { args, bindings, parenthesized: false });
-        hir::TypeBinding { hir_id: self.next_id(span), gen_args, span, ident, kind }
+        hir::TypeBinding { hir_id: self.next_id(span), gen_args, ident, kind }
     }
 }

compiler/rustc_hir/src/hir.rs

@@ -2131,7 +2131,6 @@ pub struct TypeBinding<'hir> {
     pub ident: Ident,
     pub gen_args: &'hir GenericArgs<'hir>,
     pub kind: TypeBindingKind<'hir>,
-    pub span: Span,
 }
 
 // Represents the two kinds of type bindings.

compiler/rustc_typeck/src/astconv/generics.rs

@@ -432,7 +432,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         let infer_lifetimes = gen_pos != GenericArgPosition::Type && arg_counts.lifetimes == 0;
 
         if gen_pos != GenericArgPosition::Type && !gen_args.bindings.is_empty() {
-            Self::prohibit_assoc_ty_binding(tcx, gen_args.bindings[0].span);
+            Self::prohibit_assoc_ty_binding(tcx, tcx.hir().span(gen_args.bindings[0].hir_id));
         }
 
         let explicit_late_bound =

compiler/rustc_typeck/src/astconv/mod.rs

@@ -572,7 +572,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                     item_name: binding.ident,
                     kind,
                     gen_args: binding.gen_args,
-                    span: binding.span,
+                    span: tcx.hir().span(binding.hir_id),
                 }
             })
             .collect();
@@ -1897,7 +1897,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
             // Only emit the first error to avoid overloading the user with error messages.
             if let [binding, ..] = segment.args().bindings {
                 has_err = true;
-                Self::prohibit_assoc_ty_binding(self.tcx(), binding.span);
+                Self::prohibit_assoc_ty_binding(self.tcx(), self.tcx().hir().span(binding.hir_id));
             }
         }
         has_err