Remove E0308 note when primary label has all info

[rust.git] / src / test / ui / structs / structure-constructor-type-mismatch.stderr

diff --git a/src/test/ui/structs/structure-constructor-type-mismatch.stderr b/src/test/ui/structs/structure-constructor-type-mismatch.stderr
index 375678b7cee5c0368660a3e52655a3f5a39eada8..f184f81647d13743180189a41285ca3eef50f537 100644 (file)
--- a/src/test/ui/structs/structure-constructor-type-mismatch.stderr
+++ b/src/test/ui/structs/structure-constructor-type-mismatch.stderr
@@ -6,9 +6,6 @@ LL |         x: 1,
    |            |
    |            expected f32, found integer
    |            help: use a float literal: `1.0`
-   |
-   = note: expected type `f32`
-              found type `{integer}`
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:20:12
@@ -18,9 +15,6 @@ LL |         y: 2,
    |            |
    |            expected f32, found integer
    |            help: use a float literal: `2.0`
-   |
-   = note: expected type `f32`
-              found type `{integer}`
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:26:12
@@ -30,9 +24,6 @@ LL |         x: 3,
    |            |
    |            expected f32, found integer
    |            help: use a float literal: `3.0`
-   |
-   = note: expected type `f32`
-              found type `{integer}`
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:29:12
@@ -42,9 +33,6 @@ LL |         y: 4,
    |            |
    |            expected f32, found integer
    |            help: use a float literal: `4.0`
-   |
-   = note: expected type `f32`
-              found type `{integer}`
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:35:12
@@ -54,9 +42,6 @@ LL |         x: 5,
    |            |
    |            expected f32, found integer
    |            help: use a float literal: `5.0`
-   |
-   = note: expected type `f32`
-              found type `{integer}`
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:42:12
@@ -66,9 +51,6 @@ LL |         x: 7,
    |            |
    |            expected f32, found integer
    |            help: use a float literal: `7.0`
-   |
-   = note: expected type `f32`
-              found type `{integer}`
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
   --> $DIR/structure-constructor-type-mismatch.rs:48:24
@@ -84,9 +66,6 @@ LL |         x: 9,
    |            |
    |            expected f32, found integer
    |            help: use a float literal: `9.0`
-   |
-   = note: expected type `f32`
-              found type `{integer}`
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:50:12
@@ -96,9 +75,6 @@ LL |         y: 10,
    |            |
    |            expected f32, found integer
    |            help: use a float literal: `10.0`
-   |
-   = note: expected type `f32`
-              found type `{integer}`
 
 error[E0107]: wrong number of type arguments: expected 0, found 1
   --> $DIR/structure-constructor-type-mismatch.rs:54:18
@@ -114,8 +90,8 @@ LL |     match (Point { x: 1, y: 2 }) {
 LL |         PointF::<u32> { .. } => {}
    |         ^^^^^^^^^^^^^^^^^^^^ expected integer, found f32
    |
-   = note: expected type `Point<{integer}>`
-              found type `Point<f32>`
+   = note: expected struct `Point<{integer}>`
+              found struct `Point<f32>`
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:59:9
@@ -125,8 +101,8 @@ LL |     match (Point { x: 1, y: 2 }) {
 LL |         PointF { .. } => {}
    |         ^^^^^^^^^^^^^ expected integer, found f32
    |
-   = note: expected type `Point<{integer}>`
-              found type `Point<f32>`
+   = note: expected struct `Point<{integer}>`
+              found struct `Point<f32>`
 
 error[E0308]: mismatched types
   --> $DIR/structure-constructor-type-mismatch.rs:67:9
@@ -136,10 +112,10 @@ LL |     match (Pair { x: 1, y: 2 }) {
 LL |         PairF::<u32> { .. } => {}
    |         ^^^^^^^^^^^^^^^^^^^ expected integer, found f32
    |
-   = note: expected type `Pair<{integer}, {integer}>`
-              found type `Pair<f32, u32>`
+   = note: expected struct `Pair<{integer}, {integer}>`
+              found struct `Pair<f32, u32>`
 
 error: aborting due to 13 previous errors
 
-Some errors occurred: E0107, E0308.
+Some errors have detailed explanations: E0107, E0308.
 For more information about an error, try `rustc --explain E0107`.