From 4ec396ea5dd7bddfaa667766ab6cd8824c8028da Mon Sep 17 00:00:00 2001
From: Yuki Okushi <huyuumi.dev@gmail.com>
Date: Sun, 25 Oct 2020 11:43:26 +0900
Subject: [PATCH] Test with NLL explicitly

---
 .../{issue-78262.stderr => issue-78262.default.stderr} |  6 +++---
 src/test/ui/regions/issue-78262.nll.stderr             | 10 ++++++++++
 src/test/ui/regions/issue-78262.rs                     |  7 ++++++-
 3 files changed, 19 insertions(+), 4 deletions(-)
 rename src/test/ui/regions/{issue-78262.stderr => issue-78262.default.stderr} (79%)
 create mode 100644 src/test/ui/regions/issue-78262.nll.stderr

diff --git a/src/test/ui/regions/issue-78262.stderr b/src/test/ui/regions/issue-78262.default.stderr
similarity index 79%
rename from src/test/ui/regions/issue-78262.stderr
rename to src/test/ui/regions/issue-78262.default.stderr
index 580cea00ecd4f..e97b8eca94892 100644
--- a/src/test/ui/regions/issue-78262.stderr
+++ b/src/test/ui/regions/issue-78262.default.stderr
@@ -1,13 +1,13 @@
 error[E0308]: mismatched types
-  --> $DIR/issue-78262.rs:8:28
+  --> $DIR/issue-78262.rs:12:28
    |
 LL |     let f = |x: &dyn TT| x.func();
    |                            ^^^^ lifetime mismatch
    |
    = note: expected reference `&(dyn TT + 'static)`
               found reference `&dyn TT`
-note: the anonymous lifetime #1 defined on the body at 8:13...
-  --> $DIR/issue-78262.rs:8:13
+note: the anonymous lifetime #1 defined on the body at 12:13...
+  --> $DIR/issue-78262.rs:12:13
    |
 LL |     let f = |x: &dyn TT| x.func();
    |             ^^^^^^^^^^^^^^^^^^^^^
diff --git a/src/test/ui/regions/issue-78262.nll.stderr b/src/test/ui/regions/issue-78262.nll.stderr
new file mode 100644
index 0000000000000..4607dbad4220b
--- /dev/null
+++ b/src/test/ui/regions/issue-78262.nll.stderr
@@ -0,0 +1,10 @@
+error[E0521]: borrowed data escapes outside of closure
+  --> $DIR/issue-78262.rs:12:26
+   |
+LL |     let f = |x: &dyn TT| x.func();
+   |              -           ^^^^^^^^ `x` escapes the closure body here
+   |              |
+   |              `x` is a reference that is only valid in the closure body
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/regions/issue-78262.rs b/src/test/ui/regions/issue-78262.rs
index 2324152d2c081..0bdb0abac307d 100644
--- a/src/test/ui/regions/issue-78262.rs
+++ b/src/test/ui/regions/issue-78262.rs
@@ -1,3 +1,7 @@
+// revisions: nll default
+// ignore-compare-mode-nll
+//[nll]compile-flags: -Z borrowck=mir
+
 trait TT {}
 
 impl dyn TT {
@@ -5,5 +9,6 @@ impl dyn TT {
 }
 
 fn main() {
-    let f = |x: &dyn TT| x.func(); //~ ERROR: mismatched types
+    let f = |x: &dyn TT| x.func(); //[default]~ ERROR: mismatched types
+    //[nll]~^ ERROR: borrowed data escapes outside of closure
 }