update tests for migrate mode by default

9 files changed, 18 insertions, 70 deletions

diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr b/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr
deleted file mode 100644
index a60f1c77a58..00000000000
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
-  --> $DIR/huge_multispan_highlight.rs:90:13
-   |
-LL |     let x = "foo";
-   |         - help: consider changing this to be mutable: `mut x`
-...
-LL |     let y = &mut x;
-   |             ^^^^^^ cannot borrow as mutable
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0596`.
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
index 13bd666a507..a60f1c77a58 100644
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
+++ b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
@@ -1,11 +1,11 @@
-error[E0596]: cannot borrow immutable local variable `x` as mutable
-  --> $DIR/huge_multispan_highlight.rs:90:18
+error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
+  --> $DIR/huge_multispan_highlight.rs:90:13
    |
 LL |     let x = "foo";
-   |         - help: make this binding mutable: `mut x`
+   |         - help: consider changing this to be mutable: `mut x`
 ...
 LL |     let y = &mut x;
-   |                  ^ cannot borrow mutably
+   |             ^^^^^^ cannot borrow as mutable
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/codemap_tests/issue-11715.nll.stderr b/src/test/ui/codemap_tests/issue-11715.nll.stderr
deleted file mode 100644
index d0c29c768eb..00000000000
--- a/src/test/ui/codemap_tests/issue-11715.nll.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/issue-11715.rs:5:13
-   |
-LL |     let y = &mut x;
-   |             ------ first mutable borrow occurs here
-LL |     let z = &mut x;
-   |             ^^^^^^ second mutable borrow occurs here
-LL |     z.use_mut();
-LL |     y.use_mut();
-   |     - first borrow later used here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/codemap_tests/issue-11715.stderr b/src/test/ui/codemap_tests/issue-11715.stderr
index c37e6b34727..d0c29c768eb 100644
--- a/src/test/ui/codemap_tests/issue-11715.stderr
+++ b/src/test/ui/codemap_tests/issue-11715.stderr
@@ -1,13 +1,13 @@
 error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/issue-11715.rs:5:18
+  --> $DIR/issue-11715.rs:5:13
    |
 LL |     let y = &mut x;
-   |                  - first mutable borrow occurs here
+   |             ------ first mutable borrow occurs here
 LL |     let z = &mut x;
-   |                  ^ second mutable borrow occurs here
-...
-LL | }
-   | - first borrow ends here
+   |             ^^^^^^ second mutable borrow occurs here
+LL |     z.use_mut();
+LL |     y.use_mut();
+   |     - first borrow later used here
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/codemap_tests/one_line.nll.stderr b/src/test/ui/codemap_tests/one_line.nll.stderr
deleted file mode 100644
index eddbd29c0ef..00000000000
--- a/src/test/ui/codemap_tests/one_line.nll.stderr
+++ /dev/null
@@ -1,12 +0,0 @@
-error[E0499]: cannot borrow `v` as mutable more than once at a time
-  --> $DIR/one_line.rs:3:12
-   |
-LL |     v.push(v.pop().unwrap());
-   |     - ---- ^ second mutable borrow occurs here
-   |     | |
-   |     | first borrow later used by call
-   |     first mutable borrow occurs here
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0499`.
diff --git a/src/test/ui/codemap_tests/one_line.stderr b/src/test/ui/codemap_tests/one_line.stderr
index 9dcaba8748e..eddbd29c0ef 100644
--- a/src/test/ui/codemap_tests/one_line.stderr
+++ b/src/test/ui/codemap_tests/one_line.stderr
@@ -2,9 +2,9 @@ error[E0499]: cannot borrow `v` as mutable more than once at a time
   --> $DIR/one_line.rs:3:12
    |
 LL |     v.push(v.pop().unwrap());
-   |     -      ^               - first borrow ends here
-   |     |      |
-   |     |      second mutable borrow occurs here
+   |     - ---- ^ second mutable borrow occurs here
+   |     | |
+   |     | first borrow later used by call
    |     first mutable borrow occurs here
 
 error: aborting due to previous error
diff --git a/src/test/ui/codemap_tests/tab_3.nll.stderr b/src/test/ui/codemap_tests/tab_3.nll.stderr
deleted file mode 100644
index 97816a76004..00000000000
--- a/src/test/ui/codemap_tests/tab_3.nll.stderr
+++ /dev/null
@@ -1,14 +0,0 @@
-error[E0382]: borrow of moved value: `some_vec`
-  --> $DIR/tab_3.rs:7:20
-   |
-LL |     let some_vec = vec!["hi"];
-   |         -------- move occurs because `some_vec` has type `std::vec::Vec<&str>`, which does not implement the `Copy` trait
-LL |     some_vec.into_iter();
-   |     -------- value moved here
-LL |     {
-LL |         println!("{:?}", some_vec);
-   |                          ^^^^^^^^ value borrowed here after move
-
-error: aborting due to previous error
-
-For more information about this error, try `rustc --explain E0382`.
diff --git a/src/test/ui/codemap_tests/tab_3.rs b/src/test/ui/codemap_tests/tab_3.rs
index 4fd5b70f7ae..58b034d0fcf 100644
--- a/src/test/ui/codemap_tests/tab_3.rs
+++ b/src/test/ui/codemap_tests/tab_3.rs
@@ -4,6 +4,6 @@ fn main() {
 	let some_vec = vec!["hi"];
 	some_vec.into_iter();
 	{
-		println!("{:?}", some_vec); //~ ERROR use of moved
+		println!("{:?}", some_vec); //~ ERROR borrow of moved
 	}
 }
diff --git a/src/test/ui/codemap_tests/tab_3.stderr b/src/test/ui/codemap_tests/tab_3.stderr
index 4b550dbf9ee..97816a76004 100644
--- a/src/test/ui/codemap_tests/tab_3.stderr
+++ b/src/test/ui/codemap_tests/tab_3.stderr
@@ -1,13 +1,13 @@
-error[E0382]: use of moved value: `some_vec`
+error[E0382]: borrow of moved value: `some_vec`
   --> $DIR/tab_3.rs:7:20
    |
+LL |     let some_vec = vec!["hi"];
+   |         -------- move occurs because `some_vec` has type `std::vec::Vec<&str>`, which does not implement the `Copy` trait
 LL |     some_vec.into_iter();
    |     -------- value moved here
 LL |     {
 LL |         println!("{:?}", some_vec);
-   |                          ^^^^^^^^ value used here after move
-   |
-   = note: move occurs because `some_vec` has type `std::vec::Vec<&str>`, which does not implement the `Copy` trait
+   |                          ^^^^^^^^ value borrowed here after move
 
 error: aborting due to previous error