---

brson · brson · commit 9f81074148f4 · 2012-05-31T00:06:10.000-07:00
yaml --- r: 13148 b: refs/heads/master c: 615f532 h: refs/heads/master v: v3
diff --git a/[refs] b/[refs]
@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5aae184415c4bd882707d65d195e05dca4d04bd9
+refs/heads/master: 615f5324754bdbb97998181cf1ada4c53337c7f3
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
diff --git a/trunk/src/test/compile-fail/block-deinitializes-upvar.rs b/trunk/src/test/compile-fail/block-deinitializes-upvar.rs
@@ -1,7 +1,7 @@
-// error-pattern:tried to deinitialize a variable declared in a different
+// error-pattern:moving out of immutable upvar
 fn force(f: fn()) { f(); }
 fn main() {
-    let x = @{x: 17, y: 2};
+    let mut x = @{x: 17, y: 2};
     let y = @{x: 5, y: 5};
 
     force({|| x <- y;});
diff --git a/trunk/src/test/compile-fail/issue-1965.rs b/trunk/src/test/compile-fail/issue-1965.rs
@@ -1,4 +1,4 @@
-// error-pattern:tried to deinitialize a variable declared in a different
+// error-pattern:moving out of immutable upvar
 fn test(-x: uint) {}
 
 fn main() {

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// error-pattern:tried to deinitialize a variable declared in a different`
	`1`	`+// error-pattern:moving out of immutable upvar`
`2`	`2`	`fn test(-x: uint) {}`
`3`	`3`
`4`	`4`	`fn main() {`