---

yaml
---
r: 23107
b: refs/heads/master
c: 9a77a17
h: refs/heads/master
i:
  23105: 0992ec2
  23103: ab9e21c
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 7bbdf296e0a235fcd262615ffefb20e64a7ec48e
+refs/heads/master: 9a77a17e3b51f2185fbbab2a4a301d6572834c72
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/compile-fail/liveness-closure-require-ret.rs

@@ -1,4 +1,2 @@
-// xfail-test After the closure syntax change this started failing with the wrong error message
-// error-pattern: not all control paths return
 fn force(f: fn() -> int) -> int { f() }
-fn main() { log(error, force(|| {})); }
+fn main() { log(debug, force(|| {})); } //~ ERROR mismatched types

trunk/src/test/compile-fail/liveness-issue-2163.rs

@@ -1,6 +1,5 @@
-// xfail-test After the closure syntax change this started failing with the wrong error message
-fn main(_s: ~[str]) {
+fn main() {
     let a: ~[int] = ~[];
-    do vec::each(a) |_x| { //~ ERROR not all control paths return a value
-    }
+    vec::each(a, fn@(_x: int) -> bool { //~ ERROR not all control paths return a value
+    });
 }