From 9a77a17e3b51f2185fbbab2a4a301d6572834c72 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Thu, 9 Aug 2012 10:50:18 -0700 Subject: [PATCH] unxfail-test and try to test for similar conditions as before fixes #2772 --- src/test/compile-fail/liveness-closure-require-ret.rs | 4 +--- src/test/compile-fail/liveness-issue-2163.rs | 7 +++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/test/compile-fail/liveness-closure-require-ret.rs b/src/test/compile-fail/liveness-closure-require-ret.rs index 105ffa11703..6f513f11ca2 100644 --- a/src/test/compile-fail/liveness-closure-require-ret.rs +++ b/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 diff --git a/src/test/compile-fail/liveness-issue-2163.rs b/src/test/compile-fail/liveness-issue-2163.rs index a0c52f1b4a9..f8421ce65f2 100644 --- a/src/test/compile-fail/liveness-issue-2163.rs +++ b/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 + }); }