---

yaml
---
r: 10527
b: refs/heads/snap-stage3
c: b6ed1de
h: refs/heads/master
i:
  10525: 66a7ca4
  10523: bc4c5a3
  10519: a27b01d
  10511: 1383df4
  10495: a3669a9
v: v3

Author: pcwalton

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 68670f631c22b1cab5eaa29aab4d97c94117c424
+refs/heads/snap-stage3: b6ed1de29e3092a061ed5f64ba560f6814b6d25a
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/test/compile-fail/block-deinitializes-upvar.rs

@@ -1,4 +1,4 @@
-// error-pattern:moving out of immutable upvar
+// error-pattern:moving out of immutable variable declared in an outer block
 fn force(f: fn()) { f(); }
 fn main() {
     let mut x = @{x: 17, y: 2};

branches/snap-stage3/src/test/compile-fail/borrowck-lend-flow.rs

@@ -63,7 +63,7 @@ fn loop_in_block() {
     let mut v = ~3, w = ~4;
     let mut _x = &mut w;
     for uint::range(0u, 10u) {|_i|
-        borrow(v); //! ERROR loan of mutable upvar as immutable conflicts with prior loan
+        borrow(v); //! ERROR loan of mutable variable declared in an outer block as immutable conflicts with prior loan
         _x = &mut v; //! NOTE prior loan as mutable granted here
     }
 }
@@ -77,7 +77,7 @@ fn at_most_once_block() {
     let mut v = ~3, w = ~4;
     let mut _x = &mut w;
     at_most_once {||
-        borrow(v); //! ERROR loan of mutable upvar as immutable conflicts with prior loan
+        borrow(v); //! ERROR loan of mutable variable declared in an outer block as immutable conflicts with prior loan
         _x = &mut v; //! NOTE prior loan as mutable granted here
     }
 }

branches/snap-stage3/src/test/compile-fail/borrowck-loan-blocks-mut-uniq.rs

@@ -5,7 +5,7 @@ fn borrow(v: &int, f: fn(x: &int)) {
 fn box_imm() {
     let mut v = ~3;
     borrow(v) { |w| //! NOTE loan of mutable local variable granted here
-        v = ~4; //! ERROR assigning to mutable upvar prohibited due to outstanding loan
+        v = ~4; //! ERROR assigning to mutable variable declared in an outer block prohibited due to outstanding loan
         assert *v == 3;
         assert *w == 4;
     }

branches/snap-stage3/src/test/compile-fail/cap-clause-move-upvar.rs

@@ -1,7 +1,7 @@
 fn main() {
     let x = 5;
     let _y = fn~(move x) -> int {
-        let _z = fn~(move x) -> int { x }; //! ERROR moving out of upvar
+        let _z = fn~(move x) -> int { x }; //! ERROR moving out of variable declared in an outer block
         22
     };
 }

branches/snap-stage3/src/test/compile-fail/issue-1965.rs

@@ -1,7 +1,7 @@
-// error-pattern:moving out of immutable upvar
+// error-pattern:moving out of immutable variable declared in an outer block
 fn test(-x: uint) {}
 
 fn main() {
     let i = 3u;
     for uint::range(0u, 10u) {|_x| test(i)}
-}
+}

branches/snap-stage3/src/test/compile-fail/lambda-mutate-nested.rs

@@ -1,4 +1,4 @@
-// error-pattern:assigning to immutable upvar
+// error-pattern:assigning to immutable variable declared in an outer block
 // Make sure that nesting a block within a fn@ doesn't let us
 // mutate upvars from a fn@.
 fn f2(x: fn()) { x(); }

branches/snap-stage3/src/test/compile-fail/lambda-mutate.rs

@@ -1,4 +1,4 @@
-// error-pattern:assigning to upvar
+// error-pattern:assigning to variable declared in an outer block
 // Make sure we can't write to upvars from fn@s
 fn main() {
     let i = 0;