Updated new UI tests to pass with NLL compare-mode

These tests need a review to ensure that those marked as
ignore-compare-mode-nll should be ignored and that this isn't a bug in NLL.

Author: davidtwco

src/test/ui/compile-fail-migration/associated-types-subtyping-1.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 #![allow(unused_variables)]
 
 trait Trait<'a> {

src/test/ui/compile-fail-migration/associated-types-subtyping-1.stderr

@@ -1,5 +1,5 @@
 error[E0623]: lifetime mismatch
-  --> $DIR/associated-types-subtyping-1.rs:34:37
+  --> $DIR/associated-types-subtyping-1.rs:36:37
    |
 LL | fn method2<'a,'b,T>(x: &'a T, y: &'b T)
    |                        -----     ----- these two types are declared with different lifetimes...
@@ -8,7 +8,7 @@ LL |     let _: <T as Trait<'b>>::Type = a; //~ ERROR E0623
    |                                     ^ ...but data from `y` flows into `x` here
 
 error[E0623]: lifetime mismatch
-  --> $DIR/associated-types-subtyping-1.rs:43:37
+  --> $DIR/associated-types-subtyping-1.rs:45:37
    |
 LL | fn method3<'a,'b,T>(x: &'a T, y: &'b T)
    |                        -----     ----- these two types are declared with different lifetimes...

src/test/ui/compile-fail-migration/borrow-tuple-fields.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 #![feature(box_syntax)]
 
 struct Foo(Box<isize>, isize);

src/test/ui/compile-fail-migration/borrow-tuple-fields.stderr

@@ -1,13 +1,13 @@
 error[E0505]: cannot move out of `x` because it is borrowed
-  --> $DIR/borrow-tuple-fields.rs:20:9
+  --> $DIR/borrow-tuple-fields.rs:22:9
    |
 LL |     let r = &x.0;
    |              --- borrow of `x.0` occurs here
 LL |     let y = x; //~ ERROR cannot move out of `x` because it is borrowed
    |         ^ move out of `x` occurs here
 
 error[E0502]: cannot borrow `x.0` as mutable because it is also borrowed as immutable
-  --> $DIR/borrow-tuple-fields.rs:24:18
+  --> $DIR/borrow-tuple-fields.rs:26:18
    |
 LL |     let a = &x.0;
    |              --- immutable borrow occurs here
@@ -18,7 +18,7 @@ LL | }
    | - immutable borrow ends here
 
 error[E0499]: cannot borrow `x.0` as mutable more than once at a time
-  --> $DIR/borrow-tuple-fields.rs:28:18
+  --> $DIR/borrow-tuple-fields.rs:30:18
    |
 LL |     let a = &mut x.0;
    |                  --- first mutable borrow occurs here
@@ -29,15 +29,15 @@ LL | }
    | - first borrow ends here
 
 error[E0505]: cannot move out of `x` because it is borrowed
-  --> $DIR/borrow-tuple-fields.rs:33:9
+  --> $DIR/borrow-tuple-fields.rs:35:9
    |
 LL |     let r = &x.0;
    |              --- borrow of `x.0` occurs here
 LL |     let y = x; //~ ERROR cannot move out of `x` because it is borrowed
    |         ^ move out of `x` occurs here
 
 error[E0502]: cannot borrow `x.0` as mutable because it is also borrowed as immutable
-  --> $DIR/borrow-tuple-fields.rs:37:18
+  --> $DIR/borrow-tuple-fields.rs:39:18
    |
 LL |     let a = &x.0;
    |              --- immutable borrow occurs here
@@ -48,7 +48,7 @@ LL | }
    | - immutable borrow ends here
 
 error[E0499]: cannot borrow `x.0` as mutable more than once at a time
-  --> $DIR/borrow-tuple-fields.rs:41:18
+  --> $DIR/borrow-tuple-fields.rs:43:18
    |
 LL |     let a = &mut x.0;
    |                  --- first mutable borrow occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-object-twice.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 // Check that `&mut` objects cannot be borrowed twice, just like
 // other `&mut` pointers.
 

src/test/ui/compile-fail-migration/borrowck/borrowck-borrow-mut-object-twice.stderr

@@ -1,5 +1,5 @@
 error[E0499]: cannot borrow `*x` as mutable more than once at a time
-  --> $DIR/borrowck-borrow-mut-object-twice.rs:21:5
+  --> $DIR/borrowck-borrow-mut-object-twice.rs:23:5
    |
 LL |     let _y = x.f1();
    |              - first mutable borrow occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-closures-two-mut.rs

@@ -12,6 +12,8 @@
 // access to the variable, whether that mutable access be used
 // for direct assignment or for taking mutable ref. Issue #6801.
 
+// ignore-compare-mode-nll
+
 #![feature(box_syntax)]
 
 fn to_fn_mut<F: FnMut()>(f: F) -> F { f }

src/test/ui/compile-fail-migration/borrowck/borrowck-closures-two-mut.stderr

@@ -1,5 +1,5 @@
 error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/borrowck-closures-two-mut.rs:22:24
+  --> $DIR/borrowck-closures-two-mut.rs:24:24
    |
 LL |     let c1 = to_fn_mut(|| x = 4);
    |                        -- - previous borrow occurs due to use of `x` in closure
@@ -13,7 +13,7 @@ LL | }
    | - first borrow ends here
 
 error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/borrowck-closures-two-mut.rs:32:24
+  --> $DIR/borrowck-closures-two-mut.rs:34:24
    |
 LL |     let c1 = to_fn_mut(|| set(&mut x));
    |                        --          - previous borrow occurs due to use of `x` in closure
@@ -27,7 +27,7 @@ LL | }
    | - first borrow ends here
 
 error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/borrowck-closures-two-mut.rs:38:24
+  --> $DIR/borrowck-closures-two-mut.rs:40:24
    |
 LL |     let c1 = to_fn_mut(|| x = 5);
    |                        -- - previous borrow occurs due to use of `x` in closure
@@ -41,7 +41,7 @@ LL | }
    | - first borrow ends here
 
 error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/borrowck-closures-two-mut.rs:44:24
+  --> $DIR/borrowck-closures-two-mut.rs:46:24
    |
 LL |     let c1 = to_fn_mut(|| x = 5);
    |                        -- - previous borrow occurs due to use of `x` in closure
@@ -56,7 +56,7 @@ LL | }
    | - first borrow ends here
 
 error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/borrowck-closures-two-mut.rs:55:24
+  --> $DIR/borrowck-closures-two-mut.rs:57:24
    |
 LL |     let c1 = to_fn_mut(|| set(&mut *x.f));
    |                        --           - previous borrow occurs due to use of `x` in closure

src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique-imm.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 struct Foo {
     x: isize,
 }

src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique-imm.stderr

@@ -1,5 +1,5 @@
 error[E0502]: cannot borrow `this.x` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-closures-unique-imm.rs:21:14
+  --> $DIR/borrowck-closures-unique-imm.rs:23:14
    |
 LL |         let p = &this.x;
    |                  ------ immutable borrow occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 // Tests that a closure which requires mutable access to the referent
 // of an `&mut` requires a "unique" borrow -- that is, the variable to
 // be borrowed (here, `x`) will not be borrowed *mutably*, but

src/test/ui/compile-fail-migration/borrowck/borrowck-closures-unique.stderr

@@ -1,5 +1,5 @@
 error[E0500]: closure requires unique access to `x` but it is already borrowed
-  --> $DIR/borrowck-closures-unique.rs:32:14
+  --> $DIR/borrowck-closures-unique.rs:34:14
    |
 LL |     let c1 = || get(x);
    |              --     - previous borrow occurs due to use of `x` in closure
@@ -13,7 +13,7 @@ LL | }
    | - borrow ends here
 
 error[E0500]: closure requires unique access to `x` but it is already borrowed
-  --> $DIR/borrowck-closures-unique.rs:37:14
+  --> $DIR/borrowck-closures-unique.rs:39:14
    |
 LL |     let c1 = || get(x);
    |              --     - previous borrow occurs due to use of `x` in closure
@@ -27,7 +27,7 @@ LL | }
    | - borrow ends here
 
 error[E0524]: two closures require unique access to `x` at the same time
-  --> $DIR/borrowck-closures-unique.rs:42:14
+  --> $DIR/borrowck-closures-unique.rs:44:14
    |
 LL |     let c1 = || set(x);
    |              --     - previous borrow occurs due to use of `x` in closure
@@ -41,7 +41,7 @@ LL | }
    | - borrow from first closure ends here
 
 error[E0595]: closure cannot assign to immutable argument `x`
-  --> $DIR/borrowck-closures-unique.rs:46:14
+  --> $DIR/borrowck-closures-unique.rs:48:14
    |
 LL |     let c1 = || x = panic!(); //~ ERROR closure cannot assign to immutable argument
    |              ^^ cannot borrow mutably

src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-1.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 #![feature(box_syntax)]
 
 fn main() {

src/test/ui/compile-fail-migration/borrowck/borrowck-issue-2657-1.stderr

@@ -1,5 +1,5 @@
 error[E0505]: cannot move out of `x` because it is borrowed
-  --> $DIR/borrowck-issue-2657-1.rs:17:13
+  --> $DIR/borrowck-issue-2657-1.rs:19:13
    |
 LL |       Some(ref _y) => {
    |            ------ borrow of `x.0` occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-if.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 // Note: the borrowck analysis is currently flow-insensitive.
 // Therefore, some of these errors are marked as spurious and could be
 // corrected by a simple change to the analysis.  The others are

src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow-if.stderr

@@ -1,5 +1,5 @@
 error[E0502]: cannot borrow `*v` as mutable because `v` is also borrowed as immutable
-  --> $DIR/borrowck-lend-flow-if.rs:38:21
+  --> $DIR/borrowck-lend-flow-if.rs:40:21
    |
 LL |         _w = &v;
    |               - immutable borrow occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 // Note: the borrowck analysis is currently flow-insensitive.
 // Therefore, some of these errors are marked as spurious and could be
 // corrected by a simple change to the analysis.  The others are

src/test/ui/compile-fail-migration/borrowck/borrowck-lend-flow.stderr

@@ -1,5 +1,5 @@
 error[E0502]: cannot borrow `*v` as mutable because `v` is also borrowed as immutable
-  --> $DIR/borrowck-lend-flow.rs:34:21
+  --> $DIR/borrowck-lend-flow.rs:36:21
    |
 LL |     let _w = &v;
    |               - immutable borrow occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move-cc.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 #![feature(box_syntax)]
 
 use std::thread;

src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move-cc.stderr

@@ -1,5 +1,5 @@
 error[E0504]: cannot move `v` into closure because it is borrowed
-  --> $DIR/borrowck-loan-blocks-move-cc.rs:23:27
+  --> $DIR/borrowck-loan-blocks-move-cc.rs:25:27
    |
 LL |     let _w = &v;
    |               - borrow of `v` occurs here
@@ -8,7 +8,7 @@ LL |         println!("v={}", *v);
    |                           ^ move into closure occurs here
 
 error[E0504]: cannot move `v` into closure because it is borrowed
-  --> $DIR/borrowck-loan-blocks-move-cc.rs:32:27
+  --> $DIR/borrowck-loan-blocks-move-cc.rs:34:27
    |
 LL |     let _w = &v;
    |               - borrow of `v` occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 #![feature(box_syntax)]
 
 fn take(_v: Box<isize>) {

src/test/ui/compile-fail-migration/borrowck/borrowck-loan-blocks-move.stderr

@@ -1,5 +1,5 @@
 error[E0505]: cannot move out of `v` because it is borrowed
-  --> $DIR/borrowck-loan-blocks-move.rs:19:10
+  --> $DIR/borrowck-loan-blocks-move.rs:21:10
    |
 LL |     let _w = &v;
    |               - borrow of `v` occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-subpath-of-borrowed-path.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 // verify that an error is raised when trying to move out of a
 // borrowed path.
 

src/test/ui/compile-fail-migration/borrowck/borrowck-move-from-subpath-of-borrowed-path.stderr

@@ -1,5 +1,5 @@
 error[E0505]: cannot move out of `*a` because it is borrowed
-  --> $DIR/borrowck-move-from-subpath-of-borrowed-path.rs:20:9
+  --> $DIR/borrowck-move-from-subpath-of-borrowed-path.rs:22:9
    |
 LL |     let b = &a;
    |              - borrow of `a` occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-move-mut-base-ptr.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 // Test that attempt to move `&mut` pointer while pointee is borrowed
 // yields an error.
 //

src/test/ui/compile-fail-migration/borrowck/borrowck-move-mut-base-ptr.stderr

@@ -1,5 +1,5 @@
 error[E0505]: cannot move out of `t0` because it is borrowed
-  --> $DIR/borrowck-move-mut-base-ptr.rs:18:9
+  --> $DIR/borrowck-move-mut-base-ptr.rs:20:9
    |
 LL |     let p: &isize = &*t0; // Freezes `*t0`
    |                      --- borrow of `*t0` occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-of-mut-base-ptr.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 // Test that attempt to mutably borrow `&mut` pointer while pointee is
 // borrowed yields an error.
 //

src/test/ui/compile-fail-migration/borrowck/borrowck-mut-borrow-of-mut-base-ptr.stderr

@@ -1,5 +1,5 @@
 error[E0502]: cannot borrow `t0` as mutable because `*t0` is also borrowed as immutable
-  --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:19:23
+  --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:21:23
    |
 LL |     let p: &isize = &*t0;     // Freezes `*t0`
    |                      --- immutable borrow occurs here
@@ -10,7 +10,7 @@ LL | }
    | - immutable borrow ends here
 
 error[E0499]: cannot borrow `t0` as mutable more than once at a time
-  --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:26:23
+  --> $DIR/borrowck-mut-borrow-of-mut-base-ptr.rs:28:23
    |
 LL |     let p: &mut isize = &mut *t0; // Claims `*t0`
    |                              --- first mutable borrow occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-object-lifetime.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 // Test that borrows that occur due to calls to object methods
 // properly "claim" the object path.
 

src/test/ui/compile-fail-migration/borrowck/borrowck-object-lifetime.stderr

@@ -1,5 +1,5 @@
 error[E0502]: cannot borrow `*x` as mutable because it is also borrowed as immutable
-  --> $DIR/borrowck-object-lifetime.rs:26:14
+  --> $DIR/borrowck-object-lifetime.rs:28:14
    |
 LL |     let _y = x.borrowed();
    |              - immutable borrow occurs here
@@ -9,7 +9,7 @@ LL | }
    | - immutable borrow ends here
 
 error[E0502]: cannot borrow `x` as mutable because `*x` is also borrowed as immutable
-  --> $DIR/borrowck-object-lifetime.rs:31:19
+  --> $DIR/borrowck-object-lifetime.rs:33:19
    |
 LL |     let _y = x.borrowed();
    |              - immutable borrow occurs here

src/test/ui/compile-fail-migration/borrowck/borrowck-overloaded-index-autoderef.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// ignore-compare-mode-nll
+
 // Test that we still see borrowck errors of various kinds when using
 // indexing and autoderef in combination.