bless diagnostics change

Author: adwinwhite

tests/ui/associated-inherent-types/inherent-assoc-ty-mismatch-issue-153539.stderr

@@ -11,10 +11,7 @@ LL | fn ret_ref_local<'e>() -> &'e i32 {
    |                           ------- expected `&'e i32` because of return type
 ...
 LL |     f(&1)
-   |     ^^^^^ expected `&i32`, found associated type
-   |
-   = help: consider constraining the associated type `S<'_>::P` to `&'e i32`
-   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+   |     ^^^^^ expected `&i32`, found `()`
 
 error: aborting due to 2 previous errors
 

tests/ui/associated-inherent-types/next-solver-opaque-inherent-fn-ptr-issue-155204.stderr

@@ -46,16 +46,17 @@ LL |     type AssocType = impl Send;
 error[E0308]: mismatched types
   --> $DIR/next-solver-opaque-inherent-fn-ptr-issue-155204.rs:14:9
    |
+LL |     type AssocType = impl Send;
+   |                      --------- the expected opaque type
+...
 LL |     fn ret(&self) -> Self::AssocType {
    |                      --------------- expected `Windows<for<'a> fn(&'a ())>::AssocType` because of return type
 LL |
 LL |         ()
    |         ^^ types differ
    |
-   = note: expected associated type `Windows<for<'a> fn(&'a ())>::AssocType`
-                    found unit type `()`
-   = help: consider constraining the associated type `Windows<for<'a> fn(&'a ())>::AssocType` to `()` or calling a method that returns `Windows<for<'a> fn(&'a ())>::AssocType`
-   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+   = note: expected opaque type `Windows<for<'a> fn(&'a ())>::AssocType`
+                found unit type `()`
 
 error: aborting due to 7 previous errors
 

tests/ui/associated-inherent-types/next-solver-opaque-inherent-no-ice.stderr

@@ -40,15 +40,16 @@ LL |     type ImplTrait = impl Clone;
 error[E0308]: mismatched types
   --> $DIR/next-solver-opaque-inherent-no-ice.rs:13:9
    |
+LL |     type ImplTrait = impl Clone;
+   |                      ---------- the expected opaque type
+...
 LL |     fn f() -> Self::ImplTrait {
    |               --------------- expected `Foo::ImplTrait` because of return type
 LL |         ()
    |         ^^ types differ
    |
-   = note: expected associated type `Foo::ImplTrait`
-                    found unit type `()`
-   = help: consider constraining the associated type `Foo::ImplTrait` to `()` or calling a method that returns `Foo::ImplTrait`
-   = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
+   = note: expected opaque type `Foo::ImplTrait`
+                found unit type `()`
 
 error: aborting due to 6 previous errors
 

tests/ui/associated-types/associated-types-coherence-failure.stderr

@@ -1,20 +1,20 @@
-error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `<_ as ToOwned>::Owned`
+error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `Cow<'_, _>`
   --> $DIR/associated-types-coherence-failure.rs:21:1
    |
 LL | impl<'a, B: ?Sized> IntoCow<'a, B> for <B as ToOwned>::Owned where B: ToOwned {
    | ----------------------------------------------------------------------------- first implementation here
 ...
 LL | impl<'a, B: ?Sized> IntoCow<'a, B> for Cow<'a, B> where B: ToOwned {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `<_ as ToOwned>::Owned`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Cow<'_, _>`
 
-error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `<_ as ToOwned>::Owned`
+error[E0119]: conflicting implementations of trait `IntoCow<'_, _>` for type `&_`
   --> $DIR/associated-types-coherence-failure.rs:28:1
    |
 LL | impl<'a, B: ?Sized> IntoCow<'a, B> for <B as ToOwned>::Owned where B: ToOwned {
    | ----------------------------------------------------------------------------- first implementation here
 ...
 LL | impl<'a, B: ?Sized> IntoCow<'a, B> for &'a B where B: ToOwned {
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `<_ as ToOwned>::Owned`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `&_`
 
 error: aborting due to 2 previous errors
 

tests/ui/associated-types/suggest-param-env-shadowing-incompatible-args.stderr

@@ -8,7 +8,7 @@ error[E0308]: mismatched types
   --> $DIR/suggest-param-env-shadowing-incompatible-args.rs:14:9
    |
 LL |     fn foo() -> Self::Assoc {
-   |                 ----------- expected `<() as Foo>::Assoc` because of return type
+   |                 ----------- expected `u8` because of return type
 LL |         []
    |         ^^ expected `u8`, found `[_; 0]`
    |

tests/ui/coherence/coherence-with-closure.rs

@@ -10,6 +10,6 @@ struct Wrapper<T>(T);
 trait Trait {}
 impl Trait for Wrapper<OpaqueClosure> {}
 impl<T: Sync> Trait for Wrapper<T> {}
-//~^ ERROR conflicting implementations of trait `Trait` for type `Wrapper<OpaqueClosure>`
+//~^ ERROR: conflicting implementations of trait `Trait` for type
 
 fn main() {}

tests/ui/coherence/coherence-with-closure.stderr

@@ -1,10 +1,10 @@
-error[E0119]: conflicting implementations of trait `Trait` for type `Wrapper<OpaqueClosure>`
+error[E0119]: conflicting implementations of trait `Trait` for type `Wrapper<_>`
   --> $DIR/coherence-with-closure.rs:12:1
    |
 LL | impl Trait for Wrapper<OpaqueClosure> {}
    | ------------------------------------- first implementation here
 LL | impl<T: Sync> Trait for Wrapper<T> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Wrapper<OpaqueClosure>`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Wrapper<_>`
 
 error: aborting due to 1 previous error
 

tests/ui/coherence/coherence-with-coroutine.rs

@@ -21,6 +21,6 @@ struct Wrapper<T>(T);
 trait Trait {}
 impl Trait for Wrapper<OpaqueCoroutine> {}
 impl<T: Sync> Trait for Wrapper<T> {}
-//[stock]~^ ERROR conflicting implementations of trait `Trait` for type `Wrapper<OpaqueCoroutine>`
+//[stock]~^ ERROR: conflicting implementations of trait `Trait` for type
 
 fn main() {}

tests/ui/coherence/coherence-with-coroutine.stock.stderr

@@ -1,10 +1,10 @@
-error[E0119]: conflicting implementations of trait `Trait` for type `Wrapper<OpaqueCoroutine>`
+error[E0119]: conflicting implementations of trait `Trait` for type `Wrapper<_>`
   --> $DIR/coherence-with-coroutine.rs:23:1
    |
 LL | impl Trait for Wrapper<OpaqueCoroutine> {}
    | --------------------------------------- first implementation here
 LL | impl<T: Sync> Trait for Wrapper<T> {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Wrapper<OpaqueCoroutine>`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Wrapper<_>`
 
 error: aborting due to 1 previous error
 

tests/ui/coherence/normalize-for-errors.stderr

@@ -1,11 +1,11 @@
-error[E0119]: conflicting implementations of trait `MyTrait<_>` for type `(Box<(MyType,)>, <_ as Iterator>::Item)`
+error[E0119]: conflicting implementations of trait `MyTrait<_>` for type `(Box<(MyType,)>, _)`
   --> $DIR/normalize-for-errors.rs:13:1
    |
 LL | impl<T: Copy, S: Iterator> MyTrait<S> for (T, S::Item) {}
    | ------------------------------------------------------ first implementation here
 LL |
 LL | impl<S: Iterator> MyTrait<S> for (Box<<(MyType,) as Mirror>::Assoc>, S::Item) {}
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(Box<(MyType,)>, <_ as Iterator>::Item)`
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `(Box<(MyType,)>, _)`
    |
    = note: upstream crates may add a new impl of trait `std::clone::Clone` for type `std::boxed::Box<(MyType,)>` in future versions
    = note: upstream crates may add a new impl of trait `std::marker::Copy` for type `std::boxed::Box<(MyType,)>` in future versions