New upstream version 1.63.0+dfsg1

[rustc.git] / src / test / ui / nll / lub-match.rs

diff --git a/src/test/ui/nll/lub-match.rs b/src/test/ui/nll/lub-match.rs
index 084d8b95f5893d73824f18fdb9a240dd4887a732..454dd1fc605c88004ab5aa69bb53af1bf6606b54 100644 (file)
--- a/src/test/ui/nll/lub-match.rs
+++ b/src/test/ui/nll/lub-match.rs
@@ -2,10 +2,6 @@
 // of the various arms, particularly in the case where regions are
 // involved.
 
-// revisions: base nll
-// ignore-compare-mode-nll
-//[nll] compile-flags: -Z borrowck=mir
-
 pub fn opt_str0<'a>(maybestr: &'a Option<String>) -> &'a str {
     match *maybestr {
         Some(ref s) => {
@@ -32,8 +28,7 @@ pub fn opt_str2<'a>(maybestr: &'a Option<String>) -> &'static str {
         Some(ref s) => {
             let s: &'a str = s;
             s
-            //[base]~^ ERROR E0312
-            //[nll]~^^ ERROR lifetime may not live long enough
+            //~^ ERROR lifetime may not live long enough
         }
     }
 }
@@ -43,8 +38,7 @@ pub fn opt_str3<'a>(maybestr: &'a Option<String>) -> &'static str {
         Some(ref s) => {
             let s: &'a str = s;
             s
-            //[base]~^ ERROR E0312
-            //[nll]~^^ ERROR lifetime may not live long enough
+            //~^ ERROR lifetime may not live long enough
         }
         None => "(none)",
     }