use `-Znll -Zborrowck=mir -Zverbose` consistently

6 files changed, 9 insertions, 28 deletions

diff --git a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs b/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs
index ec661bfb8e5..c61cf8a940f 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs
+++ b/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.rs
@@ -13,13 +13,12 @@
 // a variety of errors from the older, AST-based machinery (notably
 // borrowck), and then we get the NLL error at the end.
 
-// compile-flags:-Znll
+// compile-flags:-Znll -Zborrowck=mir -Zverbose
 
 fn foo(x: &u32) -> &'static u32 {
     &*x
         //~^ WARN not reporting region error due to -Znll
-        //~| ERROR `*x` does not live long enough
-        //~| ERROR free region `'_#1r` does not outlive free region `'static`
+        //~| ERROR free region `'_#1r` does not outlive free region `ReStatic`
 }
 
 fn main() { }
diff --git a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr b/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr
index d5d4a5642ea..ef7ea923912 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr
+++ b/src/test/ui/nll/closure-requirements/region-lbr-anon-does-not-outlive-static.stderr
@@ -4,29 +4,11 @@ warning: not reporting region error due to -Znll
 19 |     &*x
    |     ^^^
 
-error[E0597]: `*x` does not live long enough
-  --> $DIR/region-lbr-anon-does-not-outlive-static.rs:19:6
-   |
-19 |     &*x
-   |      ^^ does not live long enough
-   |
-   = note: borrowed value must be valid for the static lifetime...
-note: ...but borrowed value is only valid for the anonymous lifetime #1 defined on the function body at 18:1
-  --> $DIR/region-lbr-anon-does-not-outlive-static.rs:18:1
-   |
-18 | / fn foo(x: &u32) -> &'static u32 {
-19 | |     &*x
-20 | |         //~^ WARN not reporting region error due to -Znll
-21 | |         //~| ERROR `*x` does not live long enough
-22 | |         //~| ERROR free region `'_#1r` does not outlive free region `'static`
-23 | | }
-   | |_^
-
-error: free region `'_#1r` does not outlive free region `'static`
+error: free region `'_#1r` does not outlive free region `ReStatic`
   --> $DIR/region-lbr-anon-does-not-outlive-static.rs:19:5
    |
 19 |     &*x
    |     ^^^
 
-error: aborting due to 2 previous errors
+error: aborting due to previous error
 
diff --git a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs b/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs
index f70441c08d8..fcda5c5420b 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs
+++ b/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.rs
@@ -13,12 +13,12 @@
 // a variety of errors from the older, AST-based machinery (notably
 // borrowck), and then we get the NLL error at the end.
 
-// compile-flags:-Znll -Zborrowck=mir
+// compile-flags:-Znll -Zborrowck=mir -Zverbose
 
 fn foo<'a>(x: &'a u32) -> &'static u32 {
     &*x
         //~^ WARN not reporting region error due to -Znll
-        //~| ERROR free region `'_#1r` does not outlive free region `'static`
+        //~| ERROR free region `'_#1r` does not outlive free region `ReStatic`
 }
 
 fn main() { }
diff --git a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr b/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr
index a54e7b612c1..6dcb8e7cf12 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr
+++ b/src/test/ui/nll/closure-requirements/region-lbr-named-does-not-outlive-static.stderr
@@ -4,7 +4,7 @@ warning: not reporting region error due to -Znll
 19 |     &*x
    |     ^^^
 
-error: free region `'_#1r` does not outlive free region `'static`
+error: free region `'_#1r` does not outlive free region `ReStatic`
   --> $DIR/region-lbr-named-does-not-outlive-static.rs:19:5
    |
 19 |     &*x
diff --git a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs b/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs
index 94a234bc3d3..c1e4dee0065 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs
+++ b/src/test/ui/nll/closure-requirements/region-lbr1-does-not-outlive-ebr2.rs
@@ -13,7 +13,7 @@
 // a variety of errors from the older, AST-based machinery (notably
 // borrowck), and then we get the NLL error at the end.
 
-// compile-flags:-Znll -Zborrowck=mir
+// compile-flags:-Znll -Zborrowck=mir -Zverbose
 
 fn foo<'a, 'b>(x: &'a u32, y: &'b u32) -> &'b u32 {
     &*x
diff --git a/src/test/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs b/src/test/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs
index d63fd04cd2b..ffb1935e75e 100644
--- a/src/test/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs
+++ b/src/test/ui/nll/closure-requirements/region-lbr1-does-outlive-lbr2-because-implied-bound.rs
@@ -11,7 +11,7 @@
 // Basic test for free regions in the NLL code. This test does not
 // report an error because of the (implied) bound that `'b: 'a`.
 
-// compile-flags:-Znll
+// compile-flags:-Znll -Zborrowck=mir -Zverbose
 // must-compile-successfully
 
 #![allow(warnings)]