---

yaml
---
r: 41816
b: refs/heads/master
c: 90372da
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 6b6acde972bfd646e5b8a3eeaabd613c44d1028c
+refs/heads/master: 90372da5a824cf947d262dd600b2255506852f1d
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650

trunk/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 variable occurred here
+                    //~^ NOTE move of value occurred here
                     //~^^ ERROR use of moved value
-                    //~^^^ NOTE move of variable occurred here
+                    //~^^^ NOTE move of value occurred here
 
                     copy x;
                 }

trunk/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 variable occurred here
+        //~^^ NOTE move of value occurred here
         //~^^^ ERROR use of moved value: `y`
-        //~^^^^ NOTE move of variable occurred here
+        //~^^^^ NOTE move of value occurred here
     }
 }

trunk/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 variable occurred here
+    let y = move x; //~ NOTE move of value occurred here
     log(debug, *x); //~ ERROR use of moved value: `x`
     copy y;
 }

trunk/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 variable occurred here
+    send(ch, move message); //~ NOTE move of value occurred here
     log(debug, message); //~ ERROR use of moved value: `message`
 }
 

trunk/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 variable occurred here
+    do task::spawn() |move arc_v| { //~ NOTE move of value occurred here
         let v = *arc::get(&arc_v);
         assert v[3] == 4;
     };