Use revisions for NLL in nll

jackh726 · jackh726 · commit cc97875d26c2 · 2022-05-22T15:21:26.000-04:00
diff --git a/src/test/ui/hrtb/hrtb-exists-forall-fn.nll.stderr b/src/test/ui/hrtb/hrtb-exists-forall-fn.nll.stderr
diff --git a/src/test/ui/nll/continue-after-missing-main.base.stderr b/src/test/ui/nll/continue-after-missing-main.base.stderr
@@ -1,11 +1,11 @@
 error[E0601]: `main` function not found in crate `continue_after_missing_main`
-  --> $DIR/continue-after-missing-main.rs:30:2
+  --> $DIR/continue-after-missing-main.rs:34:2
    |
 LL | }
    |  ^ consider adding a `main` function to `$DIR/continue-after-missing-main.rs`
 
 error[E0623]: lifetime mismatch
-  --> $DIR/continue-after-missing-main.rs:28:56
+  --> $DIR/continue-after-missing-main.rs:32:56
    |
 LL |     tableau: Tableau<'data_provider, AdaptedMatrixProvider<'original_data, MP>>,
    |              ------------------------------------------------------------------ these two types are declared with different lifetimes...
diff --git a/src/test/ui/nll/continue-after-missing-main.nll.stderr b/src/test/ui/nll/continue-after-missing-main.nll.stderr
@@ -1,5 +1,5 @@
 error[E0601]: `main` function not found in crate `continue_after_missing_main`
-  --> $DIR/continue-after-missing-main.rs:30:2
+  --> $DIR/continue-after-missing-main.rs:34:2
    |
 LL | }
    |  ^ consider adding a `main` function to `$DIR/continue-after-missing-main.rs`
diff --git a/src/test/ui/nll/continue-after-missing-main.rs b/src/test/ui/nll/continue-after-missing-main.rs
@@ -1,3 +1,7 @@
+// ignore-compare-mode-nll
+// revisions: base nll
+// [nll]compile-flags: -Zborrowck=mir
+
 #![allow(dead_code)]
 
 struct Tableau<'a, MP> {
@@ -26,5 +30,5 @@ fn create_and_solve_subproblems<'data_provider, 'original_data, MP>(
     tableau: Tableau<'data_provider, AdaptedMatrixProvider<'original_data, MP>>,
 ) {
     let _: AdaptedMatrixProvider<'original_data, MP> = tableau.provider().clone_with_extra_bound();
-    //~^ ERROR lifetime mismatch
+    //[base]~^ ERROR lifetime mismatch
 } //~ ERROR `main` function not found in crate
diff --git a/src/test/ui/nll/issue-52213.base.stderr b/src/test/ui/nll/issue-52213.base.stderr
@@ -1,28 +1,28 @@
 error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements
-  --> $DIR/issue-52213.rs:2:11
+  --> $DIR/issue-52213.rs:6:11
    |
 LL |     match (&t,) {
    |           ^^^^^
    |
 note: first, the lifetime cannot outlive the lifetime `'a` as defined here...
-  --> $DIR/issue-52213.rs:1:23
+  --> $DIR/issue-52213.rs:5:23
    |
 LL | fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T {
    |                       ^^
 note: ...so that the types are compatible
-  --> $DIR/issue-52213.rs:2:11
+  --> $DIR/issue-52213.rs:6:11
    |
 LL |     match (&t,) {
    |           ^^^^^
    = note: expected `(&&(T,),)`
               found `(&&'a (T,),)`
 note: but, the lifetime must be valid for the lifetime `'b` as defined here...
-  --> $DIR/issue-52213.rs:1:27
+  --> $DIR/issue-52213.rs:5:27
    |
 LL | fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T {
    |                           ^^
 note: ...so that reference does not outlive borrowed content
-  --> $DIR/issue-52213.rs:3:20
+  --> $DIR/issue-52213.rs:8:20
    |
 LL |         ((u,),) => u,
    |                    ^
diff --git a/src/test/ui/nll/issue-52213.nll.stderr b/src/test/ui/nll/issue-52213.nll.stderr
@@ -1,11 +1,11 @@
 error: lifetime may not live long enough
-  --> $DIR/issue-52213.rs:3:20
+  --> $DIR/issue-52213.rs:8:20
    |
 LL | fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T {
    |                       --  -- lifetime `'b` defined here
    |                       |
    |                       lifetime `'a` defined here
-LL |     match (&t,) {
+...
 LL |         ((u,),) => u,
    |                    ^ function was supposed to return data with lifetime `'b` but it is returning data with lifetime `'a`
    |
diff --git a/src/test/ui/nll/issue-52213.rs b/src/test/ui/nll/issue-52213.rs
@@ -1,6 +1,12 @@
+// ignore-compare-mode-nll
+// revisions: base nll
+// [nll]compile-flags: -Zborrowck=mir
+
 fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T {
-    match (&t,) { //~ ERROR cannot infer an appropriate lifetime
+    match (&t,) {
+        //[base]~^ ERROR cannot infer an appropriate lifetime
         ((u,),) => u,
+        //[nll]~^ ERROR lifetime may not live long enough
     }
 }
 
diff --git a/src/test/ui/nll/issue-52533-1.base.stderr b/src/test/ui/nll/issue-52533-1.base.stderr
@@ -1,18 +1,18 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-52533-1.rs:9:18
+  --> $DIR/issue-52533-1.rs:13:18
    |
 LL |     gimme(|x, y| y)
    |                  ^ lifetime mismatch
    |
    = note: expected reference `&Foo<'_, '_, u32>`
               found reference `&Foo<'_, '_, u32>`
 note: the anonymous lifetime #3 defined here...
-  --> $DIR/issue-52533-1.rs:9:11
+  --> $DIR/issue-52533-1.rs:13:11
    |
 LL |     gimme(|x, y| y)
    |           ^^^^^^^^
 note: ...does not necessarily outlive the anonymous lifetime #2 defined here
-  --> $DIR/issue-52533-1.rs:9:11
+  --> $DIR/issue-52533-1.rs:13:11
    |
 LL |     gimme(|x, y| y)
    |           ^^^^^^^^
diff --git a/src/test/ui/nll/issue-52533-1.nll.stderr b/src/test/ui/nll/issue-52533-1.nll.stderr
@@ -1,5 +1,5 @@
 error: lifetime may not live long enough
-  --> $DIR/issue-52533-1.rs:9:18
+  --> $DIR/issue-52533-1.rs:13:18
    |
 LL |     gimme(|x, y| y)
    |            -  -  ^ closure was supposed to return data with lifetime `'2` but it is returning data with lifetime `'1`
diff --git a/src/test/ui/nll/issue-52533-1.rs b/src/test/ui/nll/issue-52533-1.rs
@@ -1,3 +1,7 @@
+// ignore-compare-mode-nll
+// revisions: base nll
+// [nll]compile-flags: -Zborrowck=mir
+
 #![allow(warnings)]
 
 struct Foo<'a, 'b, T: 'a + 'b> { x: &'a T, y: &'b T }
@@ -7,5 +11,6 @@ fn gimme(_: impl for<'a, 'b, 'c> FnOnce(&'a Foo<'a, 'b, u32>,
 
 fn main() {
     gimme(|x, y| y)
-    //~^ ERROR mismatched types [E0308]
+    //[base]~^ ERROR mismatched types [E0308]
+    //[nll]~^^ ERROR lifetime may not live long enough
 }
diff --git a/src/test/ui/nll/lint-no-err.rs b/src/test/ui/nll/lint-no-err.rs
@@ -4,11 +4,6 @@
 // when buffering lints, which resulted in ICE later on,
 // see #94502.
 
-// Errors with `nll` which is already tested in enough other tests,
-// so we ignore it here.
-//
-// ignore-compare-mode-nll
-
 struct Repro;
 impl Repro {
     fn get(&self) -> &i32 {
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.base.stderr b/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.base.stderr
@@ -1,13 +1,13 @@
 error[E0309]: the associated type `<T as MyTrait<'a>>::Output` may not live long enough
-  --> $DIR/projection-where-clause-env-wrong-bound.rs:15:5
+  --> $DIR/projection-where-clause-env-wrong-bound.rs:19:5
    |
 LL |     bar::<T::Output>()
    |     ^^^^^^^^^^^^^^^^
    |
    = help: consider adding an explicit lifetime bound `<T as MyTrait<'a>>::Output: 'a`...
    = note: ...so that the type `<T as MyTrait<'a>>::Output` will meet its required lifetime bounds...
 note: ...that is required by this bound
-  --> $DIR/projection-where-clause-env-wrong-bound.rs:29:8
+  --> $DIR/projection-where-clause-env-wrong-bound.rs:33:8
    |
 LL |     T: 'a,
    |        ^^
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.nll.stderr b/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.nll.stderr
@@ -1,5 +1,5 @@
 error[E0309]: the associated type `<T as MyTrait<'_>>::Output` may not live long enough
-  --> $DIR/projection-where-clause-env-wrong-bound.rs:15:5
+  --> $DIR/projection-where-clause-env-wrong-bound.rs:19:5
    |
 LL |     bar::<T::Output>()
    |     ^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.rs b/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-bound.rs
@@ -1,3 +1,7 @@
+// revisions: base nll
+// ignore-compare-mode-nll
+//[nll] compile-flags: -Z borrowck=mir
+
 // Test that we are able to establish that `<T as
 // MyTrait<'a>>::Output` outlives `'b` here. We need to prove however
 // that `<T as MyTrait<'a>>::Output` outlives `'a`, so we also have to
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.base.stderr b/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.base.stderr
@@ -1,13 +1,13 @@
 error[E0309]: the associated type `<T as MyTrait<'a>>::Output` may not live long enough
-  --> $DIR/projection-where-clause-env-wrong-lifetime.rs:14:5
+  --> $DIR/projection-where-clause-env-wrong-lifetime.rs:18:5
    |
 LL |     bar::<<T as MyTrait<'a>>::Output>()
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: consider adding an explicit lifetime bound `<T as MyTrait<'a>>::Output: 'a`...
    = note: ...so that the type `<T as MyTrait<'a>>::Output` will meet its required lifetime bounds...
 note: ...that is required by this bound
-  --> $DIR/projection-where-clause-env-wrong-lifetime.rs:20:8
+  --> $DIR/projection-where-clause-env-wrong-lifetime.rs:25:8
    |
 LL |     T: 'a,
    |        ^^
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.nll.stderr b/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.nll.stderr
@@ -1,5 +1,5 @@
 error[E0309]: the associated type `<T as MyTrait<'_>>::Output` may not live long enough
-  --> $DIR/projection-where-clause-env-wrong-lifetime.rs:14:5
+  --> $DIR/projection-where-clause-env-wrong-lifetime.rs:18:5
    |
 LL |     bar::<<T as MyTrait<'a>>::Output>()
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.rs b/src/test/ui/nll/ty-outlives/projection-where-clause-env-wrong-lifetime.rs
@@ -1,3 +1,7 @@
+// revisions: base nll
+// ignore-compare-mode-nll
+//[nll] compile-flags: -Z borrowck=mir
+
 // Test that if we need to prove that `<T as MyTrait<'a>>::Output:
 // 'a`, but we only know that `<T as MyTrait<'b>>::Output: 'a`, that
 // doesn't suffice.
@@ -12,7 +16,8 @@ where
     <T as MyTrait<'b>>::Output: 'a,
 {
     bar::<<T as MyTrait<'a>>::Output>()
-    //~^ ERROR the associated type `<T as MyTrait<'a>>::Output` may not live long enough
+    //[base]~^ ERROR the associated type `<T as MyTrait<'a>>::Output` may not live long enough
+    //[nll]~^^ ERROR the associated type `<T as MyTrait<'_>>::Output` may not live long enough
 }
 
 fn bar<'a, T>() -> &'a ()

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	error[E0601]: `main` function not found in crate `continue_after_missing_main`
`2`		`- --> $DIR/continue-after-missing-main.rs:30:2`
	`2`	`+ --> $DIR/continue-after-missing-main.rs:34:2`
`3`	`3`	`\|`
`4`	`4`	`LL \| }`
`5`	`5`	\| ^ consider adding a `main` function to `$DIR/continue-after-missing-main.rs`
`6`	`6`
`7`	`7`	`error[E0623]: lifetime mismatch`
`8`		`- --> $DIR/continue-after-missing-main.rs:28:56`
	`8`	`+ --> $DIR/continue-after-missing-main.rs:32:56`
`9`	`9`	`\|`
`10`	`10`	`LL \| tableau: Tableau<'data_provider, AdaptedMatrixProvider<'original_data, MP>>,`
`11`	`11`	`\| ------------------------------------------------------------------ these two types are declared with different lifetimes...`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	error[E0601]: `main` function not found in crate `continue_after_missing_main`
`2`		`- --> $DIR/continue-after-missing-main.rs:30:2`
	`2`	`+ --> $DIR/continue-after-missing-main.rs:34:2`
`3`	`3`	`\|`
`4`	`4`	`LL \| }`
`5`	`5`	\| ^ consider adding a `main` function to `$DIR/continue-after-missing-main.rs`
Original file line number	Diff line number	Diff line change
`@@ -1,28 +1,28 @@`
`1`	`1`	`error[E0495]: cannot infer an appropriate lifetime due to conflicting requirements`
`2`		`- --> $DIR/issue-52213.rs:2:11`
	`2`	`+ --> $DIR/issue-52213.rs:6:11`
`3`	`3`	`\|`
`4`	`4`	`LL \| match (&t,) {`
`5`	`5`	`\| ^^^^^`
`6`	`6`	`\|`
`7`	`7`	note: first, the lifetime cannot outlive the lifetime `'a` as defined here...
`8`		`- --> $DIR/issue-52213.rs:1:23`
	`8`	`+ --> $DIR/issue-52213.rs:5:23`
`9`	`9`	`\|`
`10`	`10`	`LL \| fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T {`
`11`	`11`	`\| ^^`
`12`	`12`	`note: ...so that the types are compatible`
`13`		`- --> $DIR/issue-52213.rs:2:11`
	`13`	`+ --> $DIR/issue-52213.rs:6:11`
`14`	`14`	`\|`
`15`	`15`	`LL \| match (&t,) {`
`16`	`16`	`\| ^^^^^`
`17`	`17`	= note: expected `(&&(T,),)`
`18`	`18`	found `(&&'a (T,),)`
`19`	`19`	note: but, the lifetime must be valid for the lifetime `'b` as defined here...
`20`		`- --> $DIR/issue-52213.rs:1:27`
	`20`	`+ --> $DIR/issue-52213.rs:5:27`
`21`	`21`	`\|`
`22`	`22`	`LL \| fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T {`
`23`	`23`	`\| ^^`
`24`	`24`	`note: ...so that reference does not outlive borrowed content`
`25`		`- --> $DIR/issue-52213.rs:3:20`
	`25`	`+ --> $DIR/issue-52213.rs:8:20`
`26`	`26`	`\|`
`27`	`27`	`LL \| ((u,),) => u,`
`28`	`28`	`\| ^`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`error: lifetime may not live long enough`
`2`		`- --> $DIR/issue-52213.rs:3:20`
	`2`	`+ --> $DIR/issue-52213.rs:8:20`
`3`	`3`	`\|`
`4`	`4`	`LL \| fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T {`
`5`	`5`	\| -- -- lifetime `'b` defined here
`6`	`6`	`\| \|`
`7`	`7`	\| lifetime `'a` defined here
`8`		`-LL \| match (&t,) {`
	`8`	`+...`
`9`	`9`	`LL \| ((u,),) => u,`
`10`	`10`	\| ^ function was supposed to return data with lifetime `'b` but it is returning data with lifetime `'a`
`11`	`11`	`\|`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,12 @@`
	`1`	`+// ignore-compare-mode-nll`
	`2`	`+// revisions: base nll`
	`3`	`+// [nll]compile-flags: -Zborrowck=mir`
	`4`	`+`
`1`	`5`	`fn transmute_lifetime<'a, 'b, T>(t: &'a (T,)) -> &'b T {`
`2`		`- match (&t,) { //~ ERROR cannot infer an appropriate lifetime`
	`6`	`+ match (&t,) {`
	`7`	`+ //[base]~^ ERROR cannot infer an appropriate lifetime`
`3`	`8`	`((u,),) => u,`
	`9`	`+ //[nll]~^ ERROR lifetime may not live long enough`
`4`	`10`	`}`
`5`	`11`	`}`
`6`	`12`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`error[E0308]: mismatched types`
`2`		`- --> $DIR/issue-52533-1.rs:9:18`
	`2`	`+ --> $DIR/issue-52533-1.rs:13:18`
`3`	`3`	`\|`
`4`	`4`	`LL \| gimme(\|x, y\| y)`
`5`	`5`	`\| ^ lifetime mismatch`
`6`	`6`	`\|`
`7`	`7`	= note: expected reference `&Foo<'_, '_, u32>`
`8`	`8`	found reference `&Foo<'_, '_, u32>`
`9`	`9`	`note: the anonymous lifetime #3 defined here...`
`10`		`- --> $DIR/issue-52533-1.rs:9:11`
	`10`	`+ --> $DIR/issue-52533-1.rs:13:11`
`11`	`11`	`\|`
`12`	`12`	`LL \| gimme(\|x, y\| y)`
`13`	`13`	`\| ^^^^^^^^`
`14`	`14`	`note: ...does not necessarily outlive the anonymous lifetime #2 defined here`
`15`		`- --> $DIR/issue-52533-1.rs:9:11`
	`15`	`+ --> $DIR/issue-52533-1.rs:13:11`
`16`	`16`	`\|`
`17`	`17`	`LL \| gimme(\|x, y\| y)`
`18`	`18`	`\| ^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	error[E0309]: the associated type `<T as MyTrait<'a>>::Output` may not live long enough
`2`		`- --> $DIR/projection-where-clause-env-wrong-bound.rs:15:5`
	`2`	`+ --> $DIR/projection-where-clause-env-wrong-bound.rs:19:5`
`3`	`3`	`\|`
`4`	`4`	`LL \| bar::<T::Output>()`
`5`	`5`	`\| ^^^^^^^^^^^^^^^^`
`6`	`6`	`\|`
`7`	`7`	= help: consider adding an explicit lifetime bound `<T as MyTrait<'a>>::Output: 'a`...
`8`	`8`	= note: ...so that the type `<T as MyTrait<'a>>::Output` will meet its required lifetime bounds...
`9`	`9`	`note: ...that is required by this bound`
`10`		`- --> $DIR/projection-where-clause-env-wrong-bound.rs:29:8`
	`10`	`+ --> $DIR/projection-where-clause-env-wrong-bound.rs:33:8`
`11`	`11`	`\|`
`12`	`12`	`LL \| T: 'a,`
`13`	`13`	`\| ^^`