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