New upstream version 1.41.1+dfsg1

[rustc.git] / src / test / ui / associated-types / associated-types-eq-3.stderr

diff --git a/src/test/ui/associated-types/associated-types-eq-3.stderr b/src/test/ui/associated-types/associated-types-eq-3.stderr
index 0f2bc84aa1c592d5563d94bb4e293cc5552a9b97..d4e6bed82321b92ad1f5c9f92b2fe51f6b354aab 100644 (file)
--- a/src/test/ui/associated-types/associated-types-eq-3.stderr
+++ b/src/test/ui/associated-types/associated-types-eq-3.stderr
@@ -2,10 +2,12 @@ error[E0308]: mismatched types
   --> $DIR/associated-types-eq-3.rs:23:18
    |
 LL |     let _: Bar = x.boo();
-   |                  ^^^^^^^ expected struct `Bar`, found associated type
+   |            ---   ^^^^^^^ expected struct `Bar`, found associated type
+   |            |
+   |            expected due to this
    |
-   = note: expected type `Bar`
-              found type `<I as Foo>::A`
+   = note:       expected struct `Bar`
+           found associated type `<I as Foo>::A`
    = note: consider constraining the associated type `<I as Foo>::A` to `Bar`
    = note: for more information, visit https://doc.rust-lang.org/book/ch19-03-advanced-traits.html
 
@@ -16,19 +18,14 @@ LL | fn foo1<I: Foo<A=Bar>>(x: I) {
    |    ----        ----- required by this bound in `foo1`
 ...
 LL |     foo1(a);
-   |     ^^^^ expected struct `Bar`, found usize
-   |
-   = note: expected type `Bar`
-              found type `usize`
+   |     ^^^^ expected struct `Bar`, found `usize`
 
 error[E0271]: type mismatch resolving `<isize as Foo>::A == Bar`
   --> $DIR/associated-types-eq-3.rs:41:9
    |
 LL |     baz(&a);
-   |         ^^ expected struct `Bar`, found usize
+   |         ^^ expected struct `Bar`, found `usize`
    |
-   = note: expected type `Bar`
-              found type `usize`
    = note: required for the cast to the object type `dyn Foo<A = Bar>`
 
 error: aborting due to 3 previous errors