Revert span for "impl assoc type has extra requirements"

Author: estebank

compiler/rustc_typeck/src/check/compare_method.rs

@@ -1053,7 +1053,8 @@ crate fn compare_ty_impl<'tcx>(
     let _: Result<(), ErrorReported> = (|| {
         compare_number_of_generics(tcx, impl_ty, impl_ty_span, trait_ty, trait_item_span)?;
 
-        compare_type_predicate_entailment(tcx, impl_ty, impl_ty_span, trait_ty, impl_trait_ref)?;
+        let sp = tcx.def_span(impl_ty.def_id);
+        compare_type_predicate_entailment(tcx, impl_ty, sp, trait_ty, impl_trait_ref)?;
 
         check_type_bounds(tcx, trait_ty, impl_ty, impl_ty_span, impl_trait_ref)
     })();

src/test/ui/generic-associated-types/generic-associated-types-where.stderr

@@ -11,13 +11,13 @@ LL |     type Assoc2<T: std::fmt::Display> = Vec<T>;
    |                  ^^^^^^^^^^^^^^^^^^^
 
 error[E0276]: impl has stricter requirements than trait
-  --> $DIR/generic-associated-types-where.rs:23:40
+  --> $DIR/generic-associated-types-where.rs:23:5
    |
 LL |     type Assoc3<T>;
    |     --------------- definition of `Assoc3` from trait
 ...
 LL |     type Assoc3<T> where T: Iterator = Vec<T>;
-   |                                        ^^^^^^ impl has extra requirement `T: Iterator`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: Iterator`
 
 error: aborting due to 2 previous errors
 

src/test/ui/generic-associated-types/impl_bounds.stderr

@@ -1,17 +1,17 @@
 error[E0310]: the parameter type `T` may not live long enough
-  --> $DIR/impl_bounds.rs:16:39
+  --> $DIR/impl_bounds.rs:16:5
    |
 LL |     type A<'a> where Self: 'static = (&'a ());
-   |                                       ^^^^^^
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: consider adding an explicit lifetime bound `T: 'static`...
    = note: ...so that the type `Fooy<T>` will meet its required lifetime bounds
 
 error[E0478]: lifetime bound not satisfied
-  --> $DIR/impl_bounds.rs:18:35
+  --> $DIR/impl_bounds.rs:18:5
    |
 LL |     type B<'a, 'b> where 'b: 'a = (&'a(), &'b ());
-   |                                   ^^^^^^^^^^^^^^^
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: lifetime parameter instantiated with the lifetime `'b` as defined on the associated item at 18:16
   --> $DIR/impl_bounds.rs:18:16
@@ -42,10 +42,10 @@ LL |     type B<'a, 'b> where 'b: 'a = (&'a(), &'b ());
    |                ^^
 
 error[E0277]: the trait bound `T: Copy` is not satisfied
-  --> $DIR/impl_bounds.rs:21:31
+  --> $DIR/impl_bounds.rs:21:5
    |
 LL |     type C where Self: Copy = String;
-   |                               ^^^^^^ the trait `Copy` is not implemented for `T`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Copy` is not implemented for `T`
    |
    = note: required because of the requirements on the impl of `Copy` for `Fooy<T>`
 note: the requirement `Fooy<T>: Copy` appears on the associated impl type `C` but not on the corresponding associated trait type

src/test/ui/generic-associated-types/issue-47206-where-clause.stderr

@@ -1,11 +1,11 @@
 error[E0276]: impl has stricter requirements than trait
-  --> $DIR/issue-47206-where-clause.rs:13:40
+  --> $DIR/issue-47206-where-clause.rs:13:5
    |
 LL |     type Assoc3<T>;
    |     --------------- definition of `Assoc3` from trait
 ...
 LL |     type Assoc3<T> where T: Iterator = Vec<T>;
-   |                                        ^^^^^^ impl has extra requirement `T: Iterator`
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: Iterator`
 
 error: aborting due to previous error