---

yaml
---
r: 39231
b: refs/heads/incoming
c: 45052e1
h: refs/heads/master
i:
  39229: e798218
  39227: bbfb03e
  39223: 623e76f
  39215: d22cd9f
  39199: 2c395d9
  39167: 6f576ae
v: v3

Author: pcwalton

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
-refs/heads/incoming: b27150ef82c65b3e827b0ffb2a22d3baf131a347
+refs/heads/incoming: 45052e13a5a1835974ca2c2a3e648416db9d38cc
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/test/compile-fail/borrowck-issue-2657-1.rs

@@ -2,7 +2,7 @@ fn main() {
 let x = Some(~1);
 match x { //~ NOTE loan of immutable local variable granted here
   Some(ref _y) => {
-    let _a = move x; //~ ERROR moving out of immutable local variable prohibited due to outstanding loan
+    let _a = x; //~ ERROR moving out of immutable local variable prohibited due to outstanding loan
   }
   _ => {}
 }

branches/incoming/src/test/compile-fail/borrowck-issue-2657-2.rs

@@ -2,7 +2,7 @@ fn main() {
 let x = Some(~1);
 match x {
   Some(ref y) => {
-    let _b = move *y; //~ ERROR moving out of dereference of immutable & pointer
+    let _b = *y; //~ ERROR moving out of dereference of immutable & pointer
   }
   _ => {}
 }

branches/incoming/src/test/compile-fail/borrowck-loan-blocks-move.rs

@@ -1,10 +1,10 @@
-fn take(-_v: ~int) {
+fn take(_v: ~int) {
 }
 
 fn box_imm() {
     let v = ~3;
     let _w = &v; //~ NOTE loan of immutable local variable granted here
-    take(move v); //~ ERROR moving out of immutable local variable prohibited due to outstanding loan
+    take(v); //~ ERROR moving out of immutable local variable prohibited due to outstanding loan
 }
 
 fn main() {

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

@@ -4,7 +4,7 @@ struct Point {
 }
 
 impl Point : ops::Add<int,int> {
-    pure fn add(z: &int) -> int {
+    pure fn add(&self, z: &int) -> int {
         self.x + self.y + (*z)
     }
 }

branches/incoming/src/test/compile-fail/borrowck-no-cycle-in-exchange-heap.rs

@@ -7,7 +7,7 @@ fn main() {
     // Create a cycle!
     match *x { //~ NOTE loan of immutable local variable granted here
       node(ref y) => {
-        y.a = move x; //~ ERROR moving out of immutable local variable prohibited due to outstanding loan
+        y.a = x; //~ ERROR moving out of immutable local variable prohibited due to outstanding loan
       }
       empty => {}
     };

branches/incoming/src/test/compile-fail/borrowck-unary-move-2.rs

@@ -18,5 +18,5 @@ enum wrapper = noncopyable;
 
 fn main() {
     let x1 = wrapper(noncopyable());
-    let _x2 = move *x1; //~ ERROR moving out of enum content
+    let _x2 = *x1; //~ ERROR moving out of enum content
 }

branches/incoming/src/test/compile-fail/borrowck-unary-move.rs

@@ -1,11 +1,11 @@
 fn foo(+x: ~int) -> int {
     let y = &*x; //~ NOTE loan of argument granted here
-    free(move x); //~ ERROR moving out of argument prohibited due to outstanding loan
+    free(x); //~ ERROR moving out of argument prohibited due to outstanding loan
     *y
 }
 
 fn free(+_x: ~int) {
 }
 
 fn main() {
-}
+}

branches/incoming/src/test/compile-fail/issue-2587-2.rs

@@ -10,7 +10,7 @@ trait parse {
 
 impl parser: parse {
     fn parse() -> ~[int] {
-        dvec::unwrap(move self.tokens) //~ ERROR moving out of immutable field
+        dvec::unwrap(self.tokens) //~ ERROR moving out of immutable field
     }
 }