New upstream version 1.41.1+dfsg1

[rustc.git] / src / test / ui / liveness / liveness-return-last-stmt-semi.stderr

diff --git a/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr b/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
index 2497d93daa494628cbd367d3247addec99c8ae49..6b4de6618c51bb251b464ea1477b1f7ae30f86ca 100644 (file)
--- a/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
+++ b/src/test/ui/liveness/liveness-return-last-stmt-semi.stderr
@@ -4,49 +4,37 @@ error[E0308]: mismatched types
 LL | macro_rules! test { () => { fn foo() -> i32 { 1; } } }
    |                                ---      ^^^    - help: consider removing this semicolon
    |                                |        |
-   |                                |        expected i32, found ()
+   |                                |        expected `i32`, found `()`
    |                                implicitly returns `()` as its body has no tail or `return` expression
 ...
 LL |     test!();
    |     -------- in this macro invocation
-   |
-   = note: expected type `i32`
-              found type `()`
 
 error[E0308]: mismatched types
   --> $DIR/liveness-return-last-stmt-semi.rs:7:19
    |
 LL | fn no_return() -> i32 {}
-   |    ---------      ^^^ expected i32, found ()
+   |    ---------      ^^^ expected `i32`, found `()`
    |    |
    |    implicitly returns `()` as its body has no tail or `return` expression
-   |
-   = note: expected type `i32`
-              found type `()`
 
 error[E0308]: mismatched types
   --> $DIR/liveness-return-last-stmt-semi.rs:9:19
    |
 LL | fn bar(x: u32) -> u32 {
-   |    ---            ^^^ expected u32, found ()
+   |    ---            ^^^ expected `u32`, found `()`
    |    |
    |    implicitly returns `()` as its body has no tail or `return` expression
 LL |     x * 2;
    |          - help: consider removing this semicolon
-   |
-   = note: expected type `u32`
-              found type `()`
 
 error[E0308]: mismatched types
   --> $DIR/liveness-return-last-stmt-semi.rs:13:19
    |
 LL | fn baz(x: u64) -> u32 {
-   |    ---            ^^^ expected u32, found ()
+   |    ---            ^^^ expected `u32`, found `()`
    |    |
    |    implicitly returns `()` as its body has no tail or `return` expression
-   |
-   = note: expected type `u32`
-              found type `()`
 
 error: aborting due to 4 previous errors