Merge branch 'incoming' into snap-2012-10-05

catamorphism · catamorphism · commit 2cee21462f28 · 2012-10-08T10:48:07.000-07:00
diff --git a/src/test/compile-fail/cap-clause-use-after-move.rs b/src/test/compile-fail/cap-clause-use-after-move.rs
@@ -1,7 +1,5 @@
-// error-pattern:Unsatisfied precondition constraint
-
 fn main() {
     let x = 5;
     let _y = fn~(move x) { };
-    let _z = x; //< error: Unsatisfied precondition constraint
+    let _z = x; //~ ERROR use of moved variable: `x`
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,5 @@`
`1`		`-// error-pattern:Unsatisfied precondition constraint`
`2`		`-`
`3`	`1`	`fn main() {`
`4`	`2`	`let x = 5;`
`5`	`3`	`let _y = fn~(move x) { };`
`6`		`- let _z = x; //< error: Unsatisfied precondition constraint`
	`4`	+ let _z = x; //~ ERROR use of moved variable: `x`
`7`	`5`	`}`