---

yaml
---
r: 23604
b: refs/heads/master
c: 3462bb6
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f74014b0e7a6fd962d0eadac924b24ef7ddc80ff
+refs/heads/master: 3462bb6a462253333758b12a8cb1ee72981329cb
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/compile-fail/do2.rs

@@ -7,5 +7,7 @@
 fn f(f: fn@(int) -> bool) -> bool { f(10i) }
 
 fn main() {
-    assert do f() |i| { i == 10i } == 10i; //~ ERROR: expected `bool` but found `int`
+    assert do f() |i| { i == 10i } == 10i;
+    //~^ ERROR: expected `bool` but found `int`
+    //~^^ ERROR: expected `bool` but found `int`
 }

trunk/src/test/compile-fail/fn-compare-mismatch.rs

@@ -5,7 +5,8 @@
 
 fn main() {
     fn f() { }
-    fn g(i: int) { }
+    fn g() { }
     let x = f == g;
-    //~^ ERROR binary operation == cannot be applied to type
+    //~^ ERROR mismatched types
+    //~^^ ERROR cannot determine a type
 }