---

yaml
---
r: 33695
b: refs/heads/snap-stage3
c: d58e0e3
h: refs/heads/master
i:
  33693: af770e5
  33691: 271b0f4
  33687: be770f2
  33679: dfee55b
  33663: f113cbc
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 35b2960d0074a776556a22b13834ad8f657ffc2e
+refs/heads/snap-stage3: d58e0e30edf540c7c6212d0ab7c617c272b27f8e
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/compile-fail/bad-type-env-capture.rs

@@ -1,6 +1,5 @@
-// xfail-test
-// error-pattern: attempted dynamic environment-capture
 fn foo<T>() {
-    fn bar(b: T) { }
+    fn bar(b: T) { } //~ ERROR attempt to use a type argument out of scope
+    //~^ ERROR use of undeclared type name
 }
 fn main() { }

branches/snap-stage3/src/test/compile-fail/do2.rs

@@ -1,13 +1,6 @@
-// xfail-fast
-// xfail-test
-
-// This is xfail'd due to bad typecheck error messages. (There is a spurious
-// "expected `bool` but but found `int`" message.)
-
 fn f(f: fn@(int) -> bool) -> bool { f(10i) }
 
 fn main() {
     assert do f() |i| { i == 10i } == 10i;
     //~^ ERROR: expected `bool` but found `int`
-    //~^^ ERROR: expected `bool` but found `int`
 }

branches/snap-stage3/src/test/compile-fail/fn-compare-mismatch.rs

@@ -1,12 +1,7 @@
-// xfail-fast
-// xfail-test
-
-// This is xfail'd due to bad spurious typecheck error messages.
-
 fn main() {
     fn f() { }
     fn g() { }
     let x = f == g;
     //~^ ERROR mismatched types
-    //~^^ ERROR cannot determine a type
+    //~^^ ERROR failed to find an implementation of trait
 }

branches/snap-stage3/src/test/compile-fail/import-from-missing.rs

@@ -1,5 +1,4 @@
-// error-pattern:unresolved
-// xfail-test
+// error-pattern:failed to resolve import
 use spam::{ham, eggs};
 
 mod spam {

branches/snap-stage3/src/test/compile-fail/import.rs

@@ -1,5 +1,4 @@
-// xfail-test
-// error-pattern: unresolved
+// error-pattern:failed to resolve import
 use zed::bar;
 use zed::baz;
 mod zed {

branches/snap-stage3/src/test/compile-fail/infinite-tag-type-recursion.rs

@@ -1,7 +1,6 @@
-// xfail-test
 // -*- rust -*-
 
-// error-pattern: enum of infinite size
+// error-pattern: illegal recursive enum type; wrap the inner value in a box
 
 enum mlist { cons(int, mlist), nil, }
 

branches/snap-stage3/src/test/compile-fail/issue-1697.rs

@@ -1,8 +1,7 @@
-// xfail-test
 // Testing that we don't fail abnormally after hitting the errors
 
-use unresolved::*; //~ ERROR unresolved modulename
-//~^ ERROR unresolved does not name a module
+use unresolved::*; //~ ERROR unresolved name
+//~^ ERROR failed to resolve import
 
 fn main() {
 }