New upstream version 1.41.1+dfsg1

[rustc.git] / src / test / ui / type / type-ascription-precedence.stderr

diff --git a/src/test/ui/type/type-ascription-precedence.stderr b/src/test/ui/type/type-ascription-precedence.stderr
index aecb0f87387850c57fdbe19745ceb0d15be9f222..92d3f18e82f442e758090034c94659793fbeeb06 100644 (file)
--- a/src/test/ui/type/type-ascription-precedence.stderr
+++ b/src/test/ui/type/type-ascription-precedence.stderr
@@ -2,19 +2,13 @@ error[E0308]: mismatched types
   --> $DIR/type-ascription-precedence.rs:31:7
    |
 LL |     &(S: &S);
-   |       ^ expected &S, found struct `S`
-   |
-   = note: expected type `&S`
-              found type `S`
+   |       ^ expected `&S`, found struct `S`
 
 error[E0308]: mismatched types
   --> $DIR/type-ascription-precedence.rs:35:7
    |
 LL |     *(S: Z);
    |       ^ expected struct `Z`, found struct `S`
-   |
-   = note: expected type `Z`
-              found type `S`
 
 error[E0614]: type `Z` cannot be dereferenced
   --> $DIR/type-ascription-precedence.rs:35:5
@@ -27,9 +21,6 @@ error[E0308]: mismatched types
    |
 LL |     -(S: Z);
    |       ^ expected struct `Z`, found struct `S`
-   |
-   = note: expected type `Z`
-              found type `S`
 
 error[E0600]: cannot apply unary operator `-` to type `Z`
   --> $DIR/type-ascription-precedence.rs:40:5
@@ -44,18 +35,12 @@ error[E0308]: mismatched types
    |
 LL |     (S + Z): Z;
    |     ^^^^^^^ expected struct `Z`, found struct `S`
-   |
-   = note: expected type `Z`
-              found type `S`
 
 error[E0308]: mismatched types
   --> $DIR/type-ascription-precedence.rs:49:5
    |
 LL |     (S * Z): Z;
    |     ^^^^^^^ expected struct `Z`, found struct `S`
-   |
-   = note: expected type `Z`
-              found type `S`
 
 error[E0308]: mismatched types
   --> $DIR/type-ascription-precedence.rs:53:5
@@ -63,8 +48,8 @@ error[E0308]: mismatched types
 LL |     (S .. S): S;
    |     ^^^^^^^^ expected struct `S`, found struct `std::ops::Range`
    |
-   = note: expected type `S`
-              found type `std::ops::Range<S>`
+   = note: expected struct `S`
+              found struct `std::ops::Range<S>`
 
 error: aborting due to 8 previous errors