test: Fix more compile-fail bustage. rs=bustage

9 files changed, 8 insertions, 10 deletions

diff --git a/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs b/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs
index 0be10738435..8052933d405 100644
--- a/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs
+++ b/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs
@@ -29,7 +29,6 @@ fn b() {
     // Here I create an outstanding loan and check that we get conflicts:
 
     let q = &mut p; //~ NOTE prior loan as mutable granted here
-    //~^ NOTE prior loan as mutable granted here
 
     p + 3; //~ ERROR loan of mutable local variable as immutable conflicts with prior loan
     p.times(3); //~ ERROR loan of mutable local variable as immutable conflicts with prior loan
diff --git a/src/test/compile-fail/copy-a-resource.rs b/src/test/compile-fail/copy-a-resource.rs
index 311eecae7db..82aee65396a 100644
--- a/src/test/compile-fail/copy-a-resource.rs
+++ b/src/test/compile-fail/copy-a-resource.rs
@@ -14,4 +14,4 @@ fn foo(i:int) -> foo {
     }
 }
 
-fn main() { let x = move foo(10); let y = x; log(error, x); }
+fn main() { let x = move foo(10); let y = copy x; log(error, x); }
diff --git a/src/test/compile-fail/non-copyable-void.rs b/src/test/compile-fail/non-copyable-void.rs
index eaba1d86119..d6ca0862912 100644
--- a/src/test/compile-fail/non-copyable-void.rs
+++ b/src/test/compile-fail/non-copyable-void.rs
@@ -2,7 +2,7 @@ fn main() {
     let x : *~[int] = ptr::addr_of(&~[1,2,3]);
     let y : *libc::c_void = x as *libc::c_void;
     unsafe {
-        let _z = *y;
+        let _z = copy *y;
         //~^ ERROR copying a noncopyable value
     }
 }
diff --git a/src/test/compile-fail/noncopyable-class.rs b/src/test/compile-fail/noncopyable-class.rs
index ee786370dfb..bbcb0f45951 100644
--- a/src/test/compile-fail/noncopyable-class.rs
+++ b/src/test/compile-fail/noncopyable-class.rs
@@ -28,4 +28,4 @@ fn foo(i:int) -> foo {
     }
 }
 
-fn main() { let x = move foo(10); let y = x; log(error, x); }
+fn main() { let x = move foo(10); let y = copy x; log(error, x); }
diff --git a/src/test/compile-fail/pinned-deep-copy.rs b/src/test/compile-fail/pinned-deep-copy.rs
index dbb57d7ee86..1add2937de9 100644
--- a/src/test/compile-fail/pinned-deep-copy.rs
+++ b/src/test/compile-fail/pinned-deep-copy.rs
@@ -21,7 +21,7 @@ fn main() {
     {
         // Can't do this copy
         let x = ~~~{y: r(i)};
-        let z = x;
+        let z = copy x;
         log(debug, x);
     }
     log(error, *i);
diff --git a/src/test/compile-fail/record-with-resource.rs b/src/test/compile-fail/record-with-resource.rs
index 01a6c729e7f..7f9badc1329 100644
--- a/src/test/compile-fail/record-with-resource.rs
+++ b/src/test/compile-fail/record-with-resource.rs
@@ -19,7 +19,7 @@ fn my_resource(x: int) -> my_resource {
 fn main() {
     {
         let a = {x: 0, y: my_resource(20)};
-        let b = {x: 2,.. a};
+        let b = {x: 2,.. copy a};
         log(error, (a, b));
     }
 }
diff --git a/src/test/compile-fail/unique-pinned-nocopy.rs b/src/test/compile-fail/unique-pinned-nocopy.rs
index d9eeced26fe..75815242aea 100644
--- a/src/test/compile-fail/unique-pinned-nocopy.rs
+++ b/src/test/compile-fail/unique-pinned-nocopy.rs
@@ -10,6 +10,6 @@ impl r : Drop {
 
 fn main() {
     let i = move ~r { b: true };
-    let j = i;
+    let j = copy i;
     log(debug, i);
 }
diff --git a/src/test/compile-fail/unique-vec-res.rs b/src/test/compile-fail/unique-vec-res.rs
index 0c3ab53dcc7..babd29b4255 100644
--- a/src/test/compile-fail/unique-vec-res.rs
+++ b/src/test/compile-fail/unique-vec-res.rs
@@ -11,7 +11,6 @@ impl r : Drop {
 }
 
 fn f<T>(+i: ~[T], +j: ~[T]) {
-    let k = i + j;
 }
 
 fn main() {
@@ -19,7 +18,7 @@ fn main() {
     let i2 = @mut 1;
     let r1 = move ~[~r { i: i1 }];
     let r2 = move ~[~r { i: i2 }];
-    f(r1, r2);
+    f(copy r1, copy r2);
     log(debug, (r2, *i1));
     log(debug, (r1, *i2));
 }
diff --git a/src/test/compile-fail/vec-res-add.rs b/src/test/compile-fail/vec-res-add.rs
index c0e6f2b60c1..a8f6aca0a69 100644
--- a/src/test/compile-fail/vec-res-add.rs
+++ b/src/test/compile-fail/vec-res-add.rs
@@ -1,4 +1,4 @@
-// error-pattern: copying a noncopyable value
+// error-pattern: instantiating a type parameter with an incompatible type
 
 struct r {
   i:int