---

yaml
---
r: 35519
b: refs/heads/master
c: b07a78b
h: refs/heads/master
i:
  35517: 7b227e2
  35515: 4296b6f
  35511: 5d9d9dc
  35503: 3b89daa
  35487: 2f6041c
  35455: fdecfd9
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9677fff0f9327915b62e4f251d3ad95d2912240d
+refs/heads/master: b07a78b7cbf2d491b616c0a7bbf7f1b0611e4655
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/test/compile-fail/block-arg-used-as-lambda-with-illegal-cap.rs

@@ -13,7 +13,7 @@ fn to_lambda1(f: fn@(uint) -> uint) -> fn@(uint) -> uint {
 }
 
 fn to_lambda2(b: fn(uint) -> uint) -> fn@(uint) -> uint {
-    return to_lambda1({|x| b(x)}); //~ ERROR value may contain borrowed pointers
+    return to_lambda1({|x| b(x)}); //~ ERROR illegal move from argument `b`
 }
 
 fn main() {

trunk/src/test/compile-fail/copy-into-closure.rs

@@ -8,42 +8,23 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn closure1(+x: ~str) -> (~str, fn@() -> ~str) {
-    let f = fn@() -> ~str {
-        copy x
-        //~^ WARNING implicitly copying a non-implicitly-copyable value
-        //~^^ NOTE to copy values into a @fn closure, use a capture clause
-    };
-    (move x,f)
-}
-
 fn closure2(+x: util::NonCopyable) -> (util::NonCopyable,
                                        fn@() -> util::NonCopyable) {
-    let f = fn@() -> util::NonCopyable {
-        copy x
+    let f = fn@(copy x) -> util::NonCopyable {
         //~^ ERROR copying a noncopyable value
         //~^^ NOTE non-copyable value cannot be copied into a @fn closure
-        //~^^^ ERROR copying a noncopyable value
+        copy x
+        //~^ ERROR copying a noncopyable value
     };
     (move x,f)
 }
 fn closure3(+x: util::NonCopyable) {
-    do task::spawn {
-        let s = copy x;
+    do task::spawn |copy x| {
         //~^ ERROR copying a noncopyable value
         //~^^ NOTE non-copyable value cannot be copied into a ~fn closure
-        //~^^^ ERROR copying a noncopyable value
-        error!("%?", s);
+        error!("%?", x);
     }
     error!("%?", x);
 }
 fn main() {
-    let x = ~"hello";
-    do task::spawn {
-        let s = copy x;
-        //~^ WARNING implicitly copying a non-implicitly-copyable value
-        //~^^ NOTE to copy values into a ~fn closure, use a capture clause
-        error!("%s from child", s);
-    }
-    error!("%s", x);
 }

trunk/src/test/compile-fail/issue-2487-b.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: copying a noncopyable value
+// error-pattern: use of moved variable
 
 extern mod std;
 use std::arc;