6 files changed, 18 insertions, 41 deletions
diff --git a/src/test/compile-fail/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs b/src/test/compile-fail/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs
index f2e6d51d064..7aa02558446 100644
--- a/src/test/compile-fail/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs
+++ b/src/test/compile-fail/borrowck/borrowck-thread-local-static-borrow-outlives-fn.rs
@@ -19,5 +19,5 @@ static FOO: u8 = 3;
 fn assert_static(_t: &'static u8) {}
 fn main() {
      assert_static(&FOO); //[ast]~ ERROR [E0597]
-                          //[mir]~^ ERROR [E0597]
+                          //[mir]~^ ERROR [E0712]
 }
diff --git a/src/test/ui/issue-17954.ast.nll.stderr b/src/test/ui/issue-17954.ast.nll.stderr
deleted file mode 100644
index 5cab7ca9e7a..00000000000
--- a/src/test/ui/issue-17954.ast.nll.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0597]: `FOO` does not live long enough
-  --> $DIR/issue-17954.rs:20:13
-   |
-LL |     let a = &FOO;
-   |             ^^^^ borrowed value does not live long enough
-...
-LL | }
-   | - `FOO` dropped here while still borrowed
-   |
-   = note: borrowed value must be valid for the static lifetime...
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/issue-17954.mir.stderr b/src/test/ui/issue-17954.mir.stderr
deleted file mode 100644
index 5cab7ca9e7a..00000000000
--- a/src/test/ui/issue-17954.mir.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0597]: `FOO` does not live long enough
-  --> $DIR/issue-17954.rs:20:13
-   |
-LL |     let a = &FOO;
-   |             ^^^^ borrowed value does not live long enough
-...
-LL | }
-   | - `FOO` dropped here while still borrowed
-   |
-   = note: borrowed value must be valid for the static lifetime...
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0597`.
diff --git a/src/test/ui/issue-17954.nll.stderr b/src/test/ui/issue-17954.nll.stderr
new file mode 100644
index 00000000000..67a5e3eaec7
--- /dev/null
+++ b/src/test/ui/issue-17954.nll.stderr
@@ -0,0 +1,12 @@
+error[E0712]: thread-local variable borrowed past end of function
+  --> $DIR/issue-17954.rs:17:13
+   |
+LL |     let a = &FOO;
+   |             ^^^^ thread-local variables cannot be borrowed beyond the end of the function
+...
+LL | }
+   | - end of enclosing function is here
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0712`.
diff --git a/src/test/ui/issue-17954.rs b/src/test/ui/issue-17954.rs
index b5e550e5be1..ce554a72548 100644
--- a/src/test/ui/issue-17954.rs
+++ b/src/test/ui/issue-17954.rs
@@ -8,9 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// revisions: ast mir
-//[mir]compile-flags: -Z borrowck=mir
-
 #![feature(thread_local)]
 
 #[thread_local]
@@ -18,16 +15,12 @@ static FOO: u8 = 3;
 
 fn main() {
     let a = &FOO;
-    //[mir]~^ ERROR `FOO` does not live long enough [E0597]
-    //[mir]~| does not live long enough
-    //[mir]~| NOTE borrowed value must be valid for the static lifetime
-    //[ast]~^^^^ ERROR borrowed value does not live long enough
-    //[ast]~| does not live long enough
-    //[ast]~| NOTE borrowed value must be valid for the static lifetime
+    //~^ ERROR borrowed value does not live long enough
+    //~| does not live long enough
+    //~| NOTE borrowed value must be valid for the static lifetime
 
     std::thread::spawn(move || {
         println!("{}", a);
     });
 }
-//[mir]~^ `FOO` dropped here while still borrowed
-//[ast]~^^ temporary value only lives until here
+//~^ NOTE temporary value only lives until here
diff --git a/src/test/ui/issue-17954.ast.stderr b/src/test/ui/issue-17954.stderr
index 677d2cbfffc..76858a9b097 100644
--- a/src/test/ui/issue-17954.ast.stderr
+++ b/src/test/ui/issue-17954.stderr
@@ -1,5 +1,5 @@
 error[E0597]: borrowed value does not live long enough
-  --> $DIR/issue-17954.rs:20:14
+  --> $DIR/issue-17954.rs:17:14
    |
 LL |     let a = &FOO;
    |              ^^^ temporary value does not live long enough