---

yaml
---
r: 52334
b: refs/heads/dist-snap
c: 9f7514b
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
 refs/heads/incoming: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
-refs/heads/dist-snap: f405e41d7a43ebd7fdd0fcd90f6e0542a5a6ccf6
+refs/heads/dist-snap: 9f7514bfaeef44077c5ecb78fb8571e6f0979ece
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/test/compile-fail/borrowck-loan-rcvr-overloaded-op.rs

@@ -55,9 +55,8 @@ fn c() {
     *q + 3;
 
 
-    // ...but not impure fns
-    (*q).times(3); //~ ERROR illegal borrow unless pure
-    //~^ NOTE impure due to access to impure function
+    // ...and impure fns
+    (*q).times(3);
 }
 
 fn main() {

branches/dist-snap/src/test/compile-fail/borrowck-loan-rcvr.rs

@@ -62,9 +62,8 @@ fn c() {
     // ...this is ok for pure fns
     (*q).purem();
 
-    // ...but not impure fns
-    (*q).impurem(); //~ ERROR illegal borrow unless pure
-    //~^ NOTE impure due to access to impure function
+    // ...and impure fns
+    (*q).impurem();
 }
 
 fn main() {

branches/dist-snap/src/test/compile-fail/liveness-move-in-loop.rs

@@ -19,9 +19,9 @@ fn main() {
                 loop {
 // tjc: Not sure why it prints the same error twice
                     x = move y; //~ ERROR use of moved value
-                    //~^ NOTE move of value occurred here
+                    //~^ NOTE move of variable occurred here
                     //~^^ ERROR use of moved value
-                    //~^^^ NOTE move of value occurred here
+                    //~^^^ NOTE move of variable occurred here
 
                     copy x;
                 }

branches/dist-snap/src/test/compile-fail/liveness-move-in-while.rs

@@ -17,8 +17,8 @@ fn main() {
 // tjc: not sure why it prints the same error twice
         while true { while true { while true { x = move y; copy x; } } }
         //~^ ERROR use of moved value: `y`
-        //~^^ NOTE move of value occurred here
+        //~^^ NOTE move of variable occurred here
         //~^^^ ERROR use of moved value: `y`
-        //~^^^^ NOTE move of value occurred here
+        //~^^^^ NOTE move of variable occurred here
     }
 }

branches/dist-snap/src/test/compile-fail/liveness-use-after-move.rs

@@ -10,7 +10,7 @@
 
 fn main() {
     let x = @5;
-    let y = move x; //~ NOTE move of value occurred here
+    let y = move x; //~ NOTE move of variable occurred here
     log(debug, *x); //~ ERROR use of moved value: `x`
     copy y;
 }

branches/dist-snap/src/test/compile-fail/liveness-use-after-send.rs

@@ -19,7 +19,7 @@ enum _chan<T> = int;
 // Tests that "log(debug, message);" is flagged as using
 // message after the send deinitializes it
 fn test00_start(ch: _chan<int>, message: int, _count: int) {
-    send(ch, move message); //~ NOTE move of value occurred here
+    send(ch, move message); //~ NOTE move of variable occurred here
     log(debug, message); //~ ERROR use of moved value: `message`
 }
 

branches/dist-snap/src/test/compile-fail/no-reuse-move-arc.rs

@@ -16,7 +16,7 @@ fn main() {
     let v = ~[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
     let arc_v = arc::ARC(v);
 
-    do task::spawn() |move arc_v| { //~ NOTE move of value occurred here
+    do task::spawn() |move arc_v| { //~ NOTE move of variable occurred here
         let v = *arc::get(&arc_v);
         assert v[3] == 4;
     };

branches/dist-snap/src/test/compile-fail/regions-escape-loop-via-vec.rs

@@ -9,15 +9,14 @@
 // except according to those terms.
 
 // The type of `y` ends up getting inferred to the type of the block.
-fn broken() -> int {
+fn broken() {
     let mut x = 3;
-    let mut y = ~[&mut x];
+    let mut _y = ~[&mut x];
     while x < 10 {
         let mut z = x;
-        y += ~[&mut z]; //~ ERROR illegal borrow
+        _y.push(&mut z); //~ ERROR illegal borrow
         x += 1;
     }
-    vec::foldl(0, y, |v, p| v + **p )
 }
 
-fn main() { }
+fn main() { }