Remove E0308 note when primary label has all info

[rust.git] / src / test / ui / coercion / coerce-expect-unsized-ascribed.stderr

diff --git a/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr b/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr
index 3b81610a06e097d9e8dcd5af2f9a6c20c0fd72f2..db8ecb818c9bd39d3d1d9ecb022598f361ebf6df 100644 (file)
--- a/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr
+++ b/src/test/ui/coercion/coerce-expect-unsized-ascribed.stderr
@@ -2,28 +2,28 @@ error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:9:13
    |
 LL |     let _ = box { [1, 2, 3] }: Box<[i32]>;
-   |             ^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements
+   |             ^^^^^^^^^^^^^^^^^ expected slice `[i32]`, found array `[i32; 3]`
    |
-   = note: expected type `std::boxed::Box<[i32]>`
-              found type `std::boxed::Box<[i32; 3]>`
+   = note: expected struct `std::boxed::Box<[i32]>`
+              found struct `std::boxed::Box<[i32; 3]>`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:10:13
    |
 LL |     let _ = box if true { [1, 2, 3] } else { [1, 3, 4] }: Box<[i32]>;
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice `[i32]`, found array `[i32; 3]`
    |
-   = note: expected type `std::boxed::Box<[i32]>`
-              found type `std::boxed::Box<[i32; 3]>`
+   = note: expected struct `std::boxed::Box<[i32]>`
+              found struct `std::boxed::Box<[i32; 3]>`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:11:13
    |
 LL |     let _ = box match true { true => [1, 2, 3], false => [1, 3, 4] }: Box<[i32]>;
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice `[i32]`, found array `[i32; 3]`
    |
-   = note: expected type `std::boxed::Box<[i32]>`
-              found type `std::boxed::Box<[i32; 3]>`
+   = note: expected struct `std::boxed::Box<[i32]>`
+              found struct `std::boxed::Box<[i32; 3]>`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:13:13
@@ -31,8 +31,8 @@ error[E0308]: mismatched types
 LL |     let _ = box { |x| (x as u8) }: Box<dyn Fn(i32) -> _>;
    |             ^^^^^^^^^^^^^^^^^^^^^ expected trait std::ops::Fn, found closure
    |
-   = note: expected type `std::boxed::Box<dyn std::ops::Fn(i32) -> u8>`
-              found type `std::boxed::Box<[closure@$DIR/coerce-expect-unsized-ascribed.rs:13:19: 13:32]>`
+   = note: expected struct `std::boxed::Box<dyn std::ops::Fn(i32) -> u8>`
+              found struct `std::boxed::Box<[closure@$DIR/coerce-expect-unsized-ascribed.rs:13:19: 13:32]>`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:14:13
@@ -40,8 +40,8 @@ error[E0308]: mismatched types
 LL |     let _ = box if true { false } else { true }: Box<dyn Debug>;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected trait std::fmt::Debug, found bool
    |
-   = note: expected type `std::boxed::Box<dyn std::fmt::Debug>`
-              found type `std::boxed::Box<bool>`
+   = note: expected struct `std::boxed::Box<dyn std::fmt::Debug>`
+              found struct `std::boxed::Box<bool>`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:15:13
@@ -49,35 +49,35 @@ error[E0308]: mismatched types
 LL |     let _ = box match true { true => 'a', false => 'b' }: Box<dyn Debug>;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected trait std::fmt::Debug, found char
    |
-   = note: expected type `std::boxed::Box<dyn std::fmt::Debug>`
-              found type `std::boxed::Box<char>`
+   = note: expected struct `std::boxed::Box<dyn std::fmt::Debug>`
+              found struct `std::boxed::Box<char>`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:17:13
    |
 LL |     let _ = &{ [1, 2, 3] }: &[i32];
-   |             ^^^^^^^^^^^^^^ expected slice, found array of 3 elements
+   |             ^^^^^^^^^^^^^^ expected slice `[i32]`, found array `[i32; 3]`
    |
-   = note: expected type `&[i32]`
-              found type `&[i32; 3]`
+   = note: expected reference `&[i32]`
+              found reference `&[i32; 3]`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:18:13
    |
 LL |     let _ = &if true { [1, 2, 3] } else { [1, 3, 4] }: &[i32];
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice `[i32]`, found array `[i32; 3]`
    |
-   = note: expected type `&[i32]`
-              found type `&[i32; 3]`
+   = note: expected reference `&[i32]`
+              found reference `&[i32; 3]`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:19:13
    |
 LL |     let _ = &match true { true => [1, 2, 3], false => [1, 3, 4] }: &[i32];
-   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements
+   |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected slice `[i32]`, found array `[i32; 3]`
    |
-   = note: expected type `&[i32]`
-              found type `&[i32; 3]`
+   = note: expected reference `&[i32]`
+              found reference `&[i32; 3]`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:21:13
@@ -85,8 +85,8 @@ error[E0308]: mismatched types
 LL |     let _ = &{ |x| (x as u8) }: &dyn Fn(i32) -> _;
    |             ^^^^^^^^^^^^^^^^^^ expected trait std::ops::Fn, found closure
    |
-   = note: expected type `&dyn std::ops::Fn(i32) -> u8`
-              found type `&[closure@$DIR/coerce-expect-unsized-ascribed.rs:21:16: 21:29]`
+   = note: expected reference `&dyn std::ops::Fn(i32) -> u8`
+              found reference `&[closure@$DIR/coerce-expect-unsized-ascribed.rs:21:16: 21:29]`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:22:13
@@ -94,8 +94,8 @@ error[E0308]: mismatched types
 LL |     let _ = &if true { false } else { true }: &dyn Debug;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected trait std::fmt::Debug, found bool
    |
-   = note: expected type `&dyn std::fmt::Debug`
-              found type `&bool`
+   = note: expected reference `&dyn std::fmt::Debug`
+              found reference `&bool`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:23:13
@@ -103,17 +103,17 @@ error[E0308]: mismatched types
 LL |     let _ = &match true { true => 'a', false => 'b' }: &dyn Debug;
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected trait std::fmt::Debug, found char
    |
-   = note: expected type `&dyn std::fmt::Debug`
-              found type `&char`
+   = note: expected reference `&dyn std::fmt::Debug`
+              found reference `&char`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:25:13
    |
 LL |     let _ = Box::new([1, 2, 3]): Box<[i32]>;
-   |             ^^^^^^^^^^^^^^^^^^^ expected slice, found array of 3 elements
+   |             ^^^^^^^^^^^^^^^^^^^ expected slice `[i32]`, found array `[i32; 3]`
    |
-   = note: expected type `std::boxed::Box<[i32]>`
-              found type `std::boxed::Box<[i32; 3]>`
+   = note: expected struct `std::boxed::Box<[i32]>`
+              found struct `std::boxed::Box<[i32; 3]>`
 
 error[E0308]: mismatched types
   --> $DIR/coerce-expect-unsized-ascribed.rs:26:13
@@ -121,8 +121,8 @@ error[E0308]: mismatched types
 LL |     let _ = Box::new(|x| (x as u8)): Box<dyn Fn(i32) -> _>;
    |             ^^^^^^^^^^^^^^^^^^^^^^^ expected trait std::ops::Fn, found closure
    |
-   = note: expected type `std::boxed::Box<dyn std::ops::Fn(i32) -> _>`
-              found type `std::boxed::Box<[closure@$DIR/coerce-expect-unsized-ascribed.rs:26:22: 26:35]>`
+   = note: expected struct `std::boxed::Box<dyn std::ops::Fn(i32) -> _>`
+              found struct `std::boxed::Box<[closure@$DIR/coerce-expect-unsized-ascribed.rs:26:22: 26:35]>`
 
 error: aborting due to 14 previous errors