---

catamorphism · catamorphism · commit 2920cb4b77bf · 2012-11-15T19:36:48.000-08:00
yaml --- r: 37603 b: refs/heads/try c: 9d6ab9a h: refs/heads/master i: 37601: 9baa230 37599: 27df47f v: v3
diff --git a/[refs] b/[refs]
@@ -2,7 +2,7 @@
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
-refs/heads/try: 39c306eeef1b235dc526b4a427ea309184882cb1
+refs/heads/try: 9d6ab9ae2326ef130a1a43876f49f00933d234e6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
diff --git a/branches/try/src/test/compile-fail/regions-var-type-out-of-scope.rs b/branches/try/src/test/compile-fail/regions-var-type-out-of-scope.rs
@@ -1,12 +1,11 @@
-// xfail-test
-
 fn foo(cond: bool) {
     // Here we will infer a type that uses the
     // region of the if stmt then block:
-    let mut x; //~ ERROR foo
+    let mut x;
 
     if cond {
-        x = &3;
+        x = &3; //~ ERROR illegal borrow: borrowed value does not live long enough
+        assert (*x == 3);
     }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,11 @@`
`1`		`-// xfail-test`
`2`		`-`
`3`	`1`	`fn foo(cond: bool) {`
`4`	`2`	`// Here we will infer a type that uses the`
`5`	`3`	`// region of the if stmt then block:`
`6`		`- let mut x; //~ ERROR foo`
	`4`	`+ let mut x;`
`7`	`5`
`8`	`6`	`if cond {`
`9`		`- x = &3;`
	`7`	`+ x = &3; //~ ERROR illegal borrow: borrowed value does not live long enough`
	`8`	`+ assert (*x == 3);`
`10`	`9`	`}`
`11`	`10`	`}`
`12`	`11`