From 47c6db09ee35810005274017abcd0798d6978a47 Mon Sep 17 00:00:00 2001
From: Paul Daniel Faria <nashenas88@users.noreply.github.com>
Date: Sat, 11 Nov 2017 16:13:23 -0500
Subject: Remove attributes and test comments accidentally left behind, add in
 span_mirbugs

---
 src/test/compile-fail/aggregate-rvalues-typeck.rs  | 29 ----------------------
 .../nll/reference-carried-through-struct-field.rs  | 27 ++++++++++++++++++++
 2 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 src/test/compile-fail/aggregate-rvalues-typeck.rs
 create mode 100644 src/test/compile-fail/nll/reference-carried-through-struct-field.rs

(limited to 'src/test/compile-fail')

diff --git a/src/test/compile-fail/aggregate-rvalues-typeck.rs b/src/test/compile-fail/aggregate-rvalues-typeck.rs
deleted file mode 100644
index 99f3e461ec9..00000000000
--- a/src/test/compile-fail/aggregate-rvalues-typeck.rs
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution and at
-// http://rust-lang.org/COPYRIGHT.
-//
-// 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.
-//revisions: ast mir
-//[mir] compile-flags: -Z emit-end-regions -Z borrowck-mir -Z nll
-
-#![allow(unused_assignments)]
-
-struct Wrap<'a> { w: &'a mut u32 }
-
-fn foo() {
-    let mut x = 22;
-    let wrapper = Wrap { w: &mut x };
-    //~^ ERROR cannot assign to `x` because it is borrowed (Mir) [E0506]
-    //~^^ ERROR cannot use `x` because it was mutably borrowed (Mir) [E0503]
-    x += 1; //[ast]~ ERROR cannot assign to `x` because it is borrowed [E0506]
-    //[mir]~^ ERROR cannot assign to `x` because it is borrowed (Ast) [E0506]
-    //[mir]~^^ ERROR cannot assign to `x` because it is borrowed (Mir) [E0506]
-    //[mir]~^^^ ERROR cannot use `x` because it was mutably borrowed (Mir) [E0503]
-    *wrapper.w += 1;
-}
-
-fn main() { }
\ No newline at end of file
diff --git a/src/test/compile-fail/nll/reference-carried-through-struct-field.rs b/src/test/compile-fail/nll/reference-carried-through-struct-field.rs
new file mode 100644
index 00000000000..afde2540829
--- /dev/null
+++ b/src/test/compile-fail/nll/reference-carried-through-struct-field.rs
@@ -0,0 +1,27 @@
+// Copyright 2017 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// 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.
+//revisions: ast mir
+//[mir] compile-flags: -Z emit-end-regions -Z borrowck-mir -Z nll
+
+#![allow(unused_assignments)]
+
+struct Wrap<'a> { w: &'a mut u32 }
+
+fn foo() {
+    let mut x = 22;
+    let wrapper = Wrap { w: &mut x };
+    x += 1; //[ast]~ ERROR cannot assign to `x` because it is borrowed [E0506]
+    //[mir]~^ ERROR cannot assign to `x` because it is borrowed (Ast) [E0506]
+    //[mir]~^^ ERROR cannot assign to `x` because it is borrowed (Mir) [E0506]
+    //[mir]~^^^ ERROR cannot use `x` because it was mutably borrowed (Mir) [E0503]
+    *wrapper.w += 1;
+}
+
+fn main() { }
\ No newline at end of file
-- 
cgit 1.4.1-3-g733a5