Fix some more test breakage.

Author: graydon

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`
 }

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
 }