New upstream version 1.24.1+dfsg1

[rustc.git] / src / test / ui / lub-glb / old-lub-glb-hr.stderr

diff --git a/src/test/ui/lub-glb/old-lub-glb-hr.stderr b/src/test/ui/lub-glb/old-lub-glb-hr.stderr
index 4a310a5e6b29685b3f0230bf43fb1e41f4754e49..105de33fac496b049387f335070a920f1a3ccc0d 100644 (file)
--- a/src/test/ui/lub-glb/old-lub-glb-hr.stderr
+++ b/src/test/ui/lub-glb/old-lub-glb-hr.stderr
@@ -1,10 +1,11 @@
 error[E0308]: match arms have incompatible types
   --> $DIR/old-lub-glb-hr.rs:18:13
    |
-18 |       let z = match 22 {
+18 |       let z = match 22 { //~ ERROR incompatible types
    |  _____________^
 19 | |         0 => x,
 20 | |         _ => y,
+   | |              - match arm with an incompatible type
 21 | |     };
    | |_____^ expected bound lifetime parameter, found concrete lifetime
    |
@@ -12,11 +13,6 @@ error[E0308]: match arms have incompatible types
               found type `for<'a> fn(&'a u8, &'a u8)`
    = note: this was previously accepted by the compiler but has been phased out
    = note: for more information, see https://github.com/rust-lang/rust/issues/45852
-note: match arm with an incompatible type
-  --> $DIR/old-lub-glb-hr.rs:20:14
-   |
-20 |         _ => y,
-   |              ^
 
 error: aborting due to previous error