Auto merge of #66389 - estebank:type-err-labels, r=petrochenkov

Specific labels when referring to "expected" and "found" types

3 files changed, 16 insertions, 46 deletions

diff --git a/src/test/ui/loops/loop-break-value.stderr b/src/test/ui/loops/loop-break-value.stderr
index 8c4bcd3a9b7..1707a179ad0 100644
--- a/src/test/ui/loops/loop-break-value.stderr
+++ b/src/test/ui/loops/loop-break-value.stderr
@@ -98,64 +98,49 @@ error[E0308]: mismatched types
   --> $DIR/loop-break-value.rs:2:31
    |
 LL |     let val: ! = loop { break break; };
-   |                               ^^^^^ expected !, found ()
+   |                               ^^^^^ expected `!`, found `()`
    |
-   = note: expected type `!`
-              found type `()`
+   = note:   expected type `!`
+           found unit type `()`
 
 error[E0308]: mismatched types
   --> $DIR/loop-break-value.rs:9:19
    |
 LL |             break 123;
-   |                   ^^^ expected &str, found integer
-   |
-   = note: expected type `&str`
-              found type `{integer}`
+   |                   ^^^ expected `&str`, found integer
 
 error[E0308]: mismatched types
   --> $DIR/loop-break-value.rs:14:15
    |
 LL |         break "asdf";
-   |               ^^^^^^ expected i32, found reference
-   |
-   = note: expected type `i32`
-              found type `&'static str`
+   |               ^^^^^^ expected `i32`, found `&str`
 
 error[E0308]: mismatched types
   --> $DIR/loop-break-value.rs:19:31
    |
 LL |             break 'outer_loop "nope";
-   |                               ^^^^^^ expected i32, found reference
-   |
-   = note: expected type `i32`
-              found type `&'static str`
+   |                               ^^^^^^ expected `i32`, found `&str`
 
 error[E0308]: mismatched types
   --> $DIR/loop-break-value.rs:71:26
    |
 LL |                 break 'c 123;
-   |                          ^^^ expected (), found integer
-   |
-   = note: expected type `()`
-              found type `{integer}`
+   |                          ^^^ expected `()`, found integer
 
 error[E0308]: mismatched types
   --> $DIR/loop-break-value.rs:78:15
    |
 LL |         break (break, break);
-   |               ^^^^^^^^^^^^^^ expected (), found tuple
+   |               ^^^^^^^^^^^^^^ expected `()`, found tuple
    |
-   = note: expected type `()`
-              found type `(!, !)`
+   = note: expected unit type `()`
+                  found tuple `(!, !)`
 
 error[E0308]: mismatched types
   --> $DIR/loop-break-value.rs:83:15
    |
 LL |         break 2;
-   |               ^ expected (), found integer
-   |
-   = note: expected type `()`
-              found type `{integer}`
+   |               ^ expected `()`, found integer
 
 error[E0308]: mismatched types
   --> $DIR/loop-break-value.rs:88:9
@@ -163,11 +148,8 @@ error[E0308]: mismatched types
 LL |         break;
    |         ^^^^^
    |         |
-   |         expected integer, found ()
+   |         expected integer, found `()`
    |         help: give it a value of the expected type: `break value`
-   |
-   = note: expected type `{integer}`
-              found type `()`
 
 error: aborting due to 16 previous errors
 
diff --git a/src/test/ui/loops/loop-labeled-break-value.stderr b/src/test/ui/loops/loop-labeled-break-value.stderr
index 8b9468cacc1..aa04d330f25 100644
--- a/src/test/ui/loops/loop-labeled-break-value.stderr
+++ b/src/test/ui/loops/loop-labeled-break-value.stderr
@@ -4,11 +4,8 @@ error[E0308]: mismatched types
 LL |         let _: i32 = loop { break };
    |                             ^^^^^
    |                             |
-   |                             expected i32, found ()
+   |                             expected `i32`, found `()`
    |                             help: give it a value of the expected type: `break 42`
-   |
-   = note: expected type `i32`
-              found type `()`
 
 error[E0308]: mismatched types
   --> $DIR/loop-labeled-break-value.rs:6:37
@@ -16,11 +13,8 @@ error[E0308]: mismatched types
 LL |         let _: i32 = 'inner: loop { break 'inner };
    |                                     ^^^^^^^^^^^^
    |                                     |
-   |                                     expected i32, found ()
+   |                                     expected `i32`, found `()`
    |                                     help: give it a value of the expected type: `break 'inner 42`
-   |
-   = note: expected type `i32`
-              found type `()`
 
 error[E0308]: mismatched types
   --> $DIR/loop-labeled-break-value.rs:9:45
@@ -28,11 +22,8 @@ error[E0308]: mismatched types
 LL |         let _: i32 = 'inner2: loop { loop { break 'inner2 } };
    |                                             ^^^^^^^^^^^^^
    |                                             |
-   |                                             expected i32, found ()
+   |                                             expected `i32`, found `()`
    |                                             help: give it a value of the expected type: `break 'inner2 42`
-   |
-   = note: expected type `i32`
-              found type `()`
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/loops/loop-properly-diverging-2.stderr b/src/test/ui/loops/loop-properly-diverging-2.stderr
index 3758bbf9f6f..5030a2935b9 100644
--- a/src/test/ui/loops/loop-properly-diverging-2.stderr
+++ b/src/test/ui/loops/loop-properly-diverging-2.stderr
@@ -4,11 +4,8 @@ error[E0308]: mismatched types
 LL |   let x: i32 = loop { break };
    |                       ^^^^^
    |                       |
-   |                       expected i32, found ()
+   |                       expected `i32`, found `()`
    |                       help: give it a value of the expected type: `break 42`
-   |
-   = note: expected type `i32`
-              found type `()`
 
 error: aborting due to previous error