---

yaml
---
r: 36569
b: refs/heads/try2
c: e6ab0ca
h: refs/heads/master
i:
  36567: 5e33534
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 216969ae08c53d9371cfba69942d87f15903756e
+refs/heads/try2: e6ab0ca8b1c75f02c37fc57137eb854ac386773e
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596

branches/try2/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

branches/try2/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); }

branches/try2/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
     }
 }

branches/try2/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); }

branches/try2/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);

branches/try2/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));
     }
 }

branches/try2/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);
 }

branches/try2/src/test/compile-fail/unique-vec-res.rs

@@ -11,15 +11,14 @@ impl r : Drop {
 }
 
 fn f<T>(+i: ~[T], +j: ~[T]) {
-    let k = i + j;
 }
 
 fn main() {
     let i1 = @mut 0;
     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));
 }

branches/try2/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