Remove Span from hir::TypeBinding.

rust-lang · cjgillot · May 19, 2020 · May 19, 2020 · May 1, 2020 · May 1, 2020
commit 4491f82d5a607b6db715cdaa3c440b123caeee6b
diff --git a/compiler/rustc_ast_lowering/src/lib.rs b/compiler/rustc_ast_lowering/src/lib.rs
@@ -1188,7 +1188,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
             hir_id: self.lower_node_id(constraint.id, constraint.span),
             ident: constraint.ident,
             kind,
-            span: constraint.span,
         }
     }
 

diff --git a/compiler/rustc_ast_lowering/src/path.rs b/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(
@@ -425,6 +425,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
     ) -> hir::TypeBinding<'hir> {
         let ident = Ident::with_dummy_span(hir::FN_OUTPUT_NAME);
         let kind = hir::TypeBindingKind::Equality { ty };
-        hir::TypeBinding { hir_id: self.next_id(span), span, ident, kind }
+        hir::TypeBinding { hir_id: self.next_id(span), ident, kind }
     }
 }
diff --git a/compiler/rustc_hir/src/hir.rs b/compiler/rustc_hir/src/hir.rs
@@ -1956,7 +1956,6 @@ pub struct TypeBinding<'hir> {
     #[stable_hasher(project(name))]
     pub ident: Ident,
     pub kind: TypeBindingKind<'hir>,
-    pub span: Span,
 }
 
 // Represents the two kinds of type bindings.

diff --git a/compiler/rustc_typeck/src/astconv/generics.rs b/compiler/rustc_typeck/src/astconv/generics.rs
@@ -404,7 +404,7 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
         }
 
         if position != GenericArgPosition::Type && !args.bindings.is_empty() {
-            AstConv::prohibit_assoc_ty_binding(tcx, args.bindings[0].span);
+            AstConv::prohibit_assoc_ty_binding(tcx, tcx.hir().span(args.bindings[0].hir_id));
         }
 
         let explicit_late_bound =

diff --git a/compiler/rustc_typeck/src/astconv/mod.rs b/compiler/rustc_typeck/src/astconv/mod.rs
@@ -548,7 +548,11 @@ impl<'o, 'tcx> dyn AstConv<'tcx> + 'o {
                         ConvertedBindingKind::Constraint(bounds)
                     }
                 };
-                ConvertedBinding { item_name: binding.ident, kind, span: binding.span }
+                ConvertedBinding {
+                    item_name: binding.ident,
+                    kind,
+                    span: tcx.hir().span(binding.hir_id),
+                }
             })
             .collect();
 
@@ -1798,7 +1802,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.generic_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
-Original file line number
+Diff line change
@@ Expand Up / @@ -1188,7 +1188,6 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> { @@
                 hir_id: self.lower_node_id(constraint.id, constraint.span),
                 ident: constraint.ident,
                 kind,
-                span: constraint.span,
             }
         }
@@ Expand Down @@