From d0151cac17cab1f88f4c3d27ac8cbb8e53f3fab6 Mon Sep 17 00:00:00 2001
From: "Felix S. Klock II" <pnkfelix@pnkfx.org>
Date: Fri, 9 Nov 2018 00:21:46 +0100
Subject: [PATCH] Switch to using `// revisions` to explicit encode NLL's
 change to `Box` treatment.

---
 ...err => borrowck-box-insensitivity.ast.stderr} |  0
 .../borrowck-box-insensitivity.mir.stderr        | 14 ++++++++++++++
 .../ui/borrowck/borrowck-box-insensitivity.rs    | 16 ++++++++--------
 3 files changed, 22 insertions(+), 8 deletions(-)
 rename src/test/ui/borrowck/{borrowck-box-insensitivity.stderr => borrowck-box-insensitivity.ast.stderr} (100%)
 create mode 100644 src/test/ui/borrowck/borrowck-box-insensitivity.mir.stderr

diff --git a/src/test/ui/borrowck/borrowck-box-insensitivity.stderr b/src/test/ui/borrowck/borrowck-box-insensitivity.ast.stderr
similarity index 100%
rename from src/test/ui/borrowck/borrowck-box-insensitivity.stderr
rename to src/test/ui/borrowck/borrowck-box-insensitivity.ast.stderr
diff --git a/src/test/ui/borrowck/borrowck-box-insensitivity.mir.stderr b/src/test/ui/borrowck/borrowck-box-insensitivity.mir.stderr
new file mode 100644
index 00000000000..0e380e90e75
--- /dev/null
+++ b/src/test/ui/borrowck/borrowck-box-insensitivity.mir.stderr
@@ -0,0 +1,14 @@
+error: compilation successful
+  --> $DIR/borrowck-box-insensitivity.rs:160:1
+   |
+LL | / fn main() {
+LL | |     copy_after_move();
+LL | |     move_after_move();
+LL | |     borrow_after_move();
+...  |
+LL | |     mut_borrow_after_borrow_nested();
+LL | | }
+   | |_^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/borrowck/borrowck-box-insensitivity.rs b/src/test/ui/borrowck/borrowck-box-insensitivity.rs
index 5efc414da77..1f1a7ea5ad9 100644
--- a/src/test/ui/borrowck/borrowck-box-insensitivity.rs
+++ b/src/test/ui/borrowck/borrowck-box-insensitivity.rs
@@ -1,13 +1,13 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
+// This test is an artifact of the old policy that `Box<T>` should not
+// be treated specially by the AST-borrowck.
 //
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
+// NLL goes back to treating `Box<T>` specially (namely, knowing that
+// it uniquely owns the data it holds). See rust-lang/rfcs#130.
 
+// revisions: ast mir
+//[ast] compile-flags: -Z borrowck=ast
+//[mir] compile-flags: -Z borrowck=mir
+// ignore-compare-mode-nll
 #![feature(box_syntax, rustc_attrs)]
 
 struct A {
-- 
GitLab