---

yaml
---
r: 42477
b: refs/heads/try
c: 440f8df
h: refs/heads/master
i:
  42475: 3004f0e
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 532c94d0f12cb2c56870c283947aa12ce2c9b9b6
+refs/heads/try: 440f8dfc4e72575e1b5f38b3ebc3d0576e7b8e15
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/src/librustc/middle/liveness.rs

@@ -1839,7 +1839,7 @@ impl @Liveness {
 
         self.report_illegal_read(move_span, lnk, var, MovedValue);
         self.tcx.sess.span_note(
-            move_span, ~"move of variable occurred here");
+            move_span, ~"move of value occurred here");
 
     }
 

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

@@ -47,16 +47,11 @@ fn b() {
 }
 
 fn c() {
-    // Here the receiver is in aliased memory and hence we cannot
-    // consider it immutable:
+    // Here the receiver is in aliased memory but due to write
+    // barriers we can still consider it immutable.
     let q = @mut Point {x: 3, y: 4};
-
-    // ...this is ok for pure fns
     *q + 3;
-
-
-    // ...and impure fns
-    (*q).times(3);
+    q.times(3);
 }
 
 fn main() {

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

@@ -55,15 +55,10 @@ fn b() {
 }
 
 fn c() {
-    // Here the receiver is in aliased memory and hence we cannot
-    // consider it immutable:
+    // Loaning @mut as & is considered legal due to dynamic checks:
     let q = @mut {x: 3, y: 4};
-
-    // ...this is ok for pure fns
-    (*q).purem();
-
-    // ...and impure fns
-    (*q).impurem();
+    q.purem();
+    q.impurem();
 }
 
 fn main() {

branches/try/src/test/compile-fail/liveness-move-from-mode.rs

@@ -15,6 +15,6 @@ fn main() {
     let x: int = 25;
     loop {
         take(move x); //~ ERROR use of moved value: `x`
-        //~^ NOTE move of variable occurred here
+        //~^ NOTE move of value occurred here
     }
 }