test -- update tests with new error messages

Author: nikomatsakis

src/test/compile-fail/arc-rw-read-mode-shouldnt-escape.rs

@@ -15,7 +15,7 @@ fn main() {
     let mut y = None;
     x.write_downgrade(|write_mode| {
         y = Some(x.downgrade(write_mode));
-        //~^ ERROR cannot infer an appropriate lifetime
+        //~^ ERROR cannot infer
     });
     y.unwrap();
     // Adding this line causes a method unification failure instead

src/test/compile-fail/borrowck-assign-comp-idx.rs

@@ -32,9 +32,9 @@ fn b() {
 
     let mut p = ~[1];
 
-    borrow(p, || {
-        p[0] = 5; //~ ERROR cannot assign to
-    });
+    borrow(
+        p,
+        || p[0] = 5); //~ ERROR cannot borrow `p` as mutable
 }
 
 fn c() {

src/test/compile-fail/borrowck-autoref-3261.rs

@@ -21,13 +21,14 @@ impl X {
 
 fn main() {
     let mut x = X(Right(main));
-    (&mut x).with(|opt| {
-        match opt {
-            &Right(ref f) => {
-                x = X(Left((0,0))); //~ ERROR cannot assign to `x`
-                (*f)()
-            },
-            _ => fail!()
-        }
-    })
+    (&mut x).with(
+        |opt| { //~ ERROR cannot borrow `x` as mutable more than once at a time
+            match opt {
+                &Right(ref f) => {
+                    x = X(Left((0,0)));
+                    (*f)()
+                },
+                _ => fail!()
+            }
+        })
 }

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

@@ -18,7 +18,7 @@ trait Foo {
 
 fn test(x: &mut Foo) {
     let _y = x.f1();
-    x.f2(); //~ ERROR cannot borrow `*x` because it is already borrowed as mutable
+    x.f2(); //~ ERROR cannot borrow `*x` as mutable
 }
 
 fn main() {}

src/test/compile-fail/borrowck-insert-during-each.rs

@@ -23,9 +23,10 @@ impl Foo {
 }
 
 fn bar(f: &mut Foo) {
-  f.foo(|a| {
-    f.n.insert(*a); //~ ERROR cannot borrow
-  })
+  f.foo(
+        |a| { //~ ERROR closure requires unique access to `f`
+            f.n.insert(*a);
+        })
 }
 
 fn main() {

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

@@ -21,7 +21,9 @@ fn box_imm() {
         info!("v={}", *v);
         //~^ ERROR cannot move `v` into closure
     });
+}
 
+fn box_imm_explicit() {
     let v = ~3;
     let _w = &v;
     task::spawn(proc() {

src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs

@@ -14,11 +14,12 @@ fn borrow(v: &int, f: |x: &int|) {
 
 fn box_imm() {
     let mut v = ~3;
-    borrow(v, |w| {
-        v = ~4; //~ ERROR cannot assign to `v` because it is borrowed
-        assert_eq!(*v, 3);
-        assert_eq!(*w, 4);
-    })
+    borrow(v,
+           |w| { //~ ERROR cannot borrow `v` as mutable
+            v = ~4;
+            assert_eq!(*v, 3);
+            assert_eq!(*w, 4);
+        })
 }
 
 fn main() {

src/test/compile-fail/borrowck-loan-rcvr.rs

@@ -32,8 +32,8 @@ fn a() {
     p.impurem();
 
     // But in this case we do not honor the loan:
-    p.blockm(|| {
-        p.x = 10; //~ ERROR cannot assign
+    p.blockm(|| { //~ ERROR cannot borrow `p` as mutable
+        p.x = 10;
     })
 }
 

src/test/compile-fail/borrowck-loan-vec-content.rs

@@ -23,9 +23,11 @@ fn has_mut_vec_and_does_not_try_to_change_it() {
 
 fn has_mut_vec_but_tries_to_change_it() {
     let mut v = ~[1, 2, 3];
-    takes_imm_elt(&v[0], || {
-        v[1] = 4; //~ ERROR cannot assign
-    })
+    takes_imm_elt(
+        &v[0],
+        || { //~ ERROR cannot borrow `v` as mutable
+            v[1] = 4;
+        })
 }
 
 fn main() {

src/test/compile-fail/borrowck-move-by-capture.rs

@@ -9,10 +9,8 @@
 // except according to those terms.
 
 pub fn main() {
-    // FIXME(#2202) - Due to the way that borrowck treats closures,
-    // you get two error reports here.
     let bar = ~3;
-    let _g = || { //~ ERROR capture of moved value
-        let _h: proc() -> int = proc() *bar; //~ ERROR capture of moved value
+    let _g = || {
+        let _h: proc() -> int = proc() *bar; //~ ERROR cannot move out of captured outer variable
     };
 }