Update tests that use -Z borrowck=compare or #[feature(nll)] to accmmodate diagnostic change.

Author: pnkfelix

src/test/ui/borrowck/issue-41962.stderr

@@ -17,41 +17,41 @@ LL |         if let Some(thing) = maybe {
    = note: move occurs because the value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait
 
 error[E0382]: use of moved value: `maybe` (Mir)
-  --> $DIR/issue-41962.rs:17:30
+  --> $DIR/issue-41962.rs:17:16
    |
 LL |         if let Some(thing) = maybe {
-   |                     -----    ^^^^^ value used here after move
-   |                     |
-   |                     value moved here
+   |                ^^^^^-----^
+   |                |    |
+   |                |    value moved here
+   |                value used here after move
    |
    = note: move occurs because value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait
 
-error[E0382]: borrow of moved value: `maybe` (Mir)
-  --> $DIR/issue-41962.rs:17:30
+error[E0382]: use of moved value (Mir)
+  --> $DIR/issue-41962.rs:17:21
    |
 LL |         if let Some(thing) = maybe {
-   |                     -----    ^^^^^ value borrowed here after move
-   |                     |
-   |                     value moved here
+   |                     ^^^^^ value moved here in previous iteration of loop
    |
    = note: move occurs because value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait
 
 error[E0382]: use of moved value: `maybe` (Mir)
-  --> $DIR/issue-41962.rs:17:16
+  --> $DIR/issue-41962.rs:17:30
    |
 LL |         if let Some(thing) = maybe {
-   |                ^^^^^-----^
-   |                |    |
-   |                |    value moved here
-   |                value used here after move
+   |                     -----    ^^^^^ value used here after move
+   |                     |
+   |                     value moved here
    |
    = note: move occurs because value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait
 
-error[E0382]: use of moved value (Mir)
-  --> $DIR/issue-41962.rs:17:21
+error[E0382]: borrow of moved value: `maybe` (Mir)
+  --> $DIR/issue-41962.rs:17:30
    |
 LL |         if let Some(thing) = maybe {
-   |                     ^^^^^ value moved here in previous iteration of loop
+   |                     -----    ^^^^^ value borrowed here after move
+   |                     |
+   |                     value moved here
    |
    = note: move occurs because value has type `std::vec::Vec<bool>`, which does not implement the `Copy` trait
 

src/test/ui/borrowck/two-phase-multi-mut.stderr

@@ -1,21 +1,21 @@
 error[E0499]: cannot borrow `foo` as mutable more than once at a time
-  --> $DIR/two-phase-multi-mut.rs:23:16
+  --> $DIR/two-phase-multi-mut.rs:23:5
    |
 LL |     foo.method(&mut foo);
-   |     -----------^^^^^^^^-
+   |     ^^^^^^^^^^^--------^
    |     |          |
-   |     |          second mutable borrow occurs here
-   |     first mutable borrow occurs here
+   |     |          first mutable borrow occurs here
+   |     second mutable borrow occurs here
    |     borrow later used here
 
 error[E0499]: cannot borrow `foo` as mutable more than once at a time
-  --> $DIR/two-phase-multi-mut.rs:23:5
+  --> $DIR/two-phase-multi-mut.rs:23:16
    |
 LL |     foo.method(&mut foo);
-   |     ^^^^^^^^^^^--------^
+   |     -----------^^^^^^^^-
    |     |          |
-   |     |          first mutable borrow occurs here
-   |     second mutable borrow occurs here
+   |     |          second mutable borrow occurs here
+   |     first mutable borrow occurs here
    |     borrow later used here
 
 error: aborting due to 2 previous errors