Fix error messages in test cases, since fns/traits now pretty-print with a bounds...

diff --git a/src/test/compile-fail/class-cast-to-trait.rs b/src/test/compile-fail/class-cast-to-trait.rs
index 7f7c58a60df0500eb8da81ba8155767cc5521ddd..0d1582bf85713b654dc3c68efa5cbb5d58cce8b6 100644 (file)
--- a/src/test/compile-fail/class-cast-to-trait.rs
+++ b/src/test/compile-fail/class-cast-to-trait.rs
@@ -58,5 +58,5 @@ fn cat(in_x : uint, in_y : int, in_name: ~str) -> cat {
 
 fn main() {
   let nyan : @noisy  = @cat(0, 2, ~"nyan") as @noisy;
-  nyan.eat(); //~ ERROR type `@noisy` does not implement any method in scope named `eat`
+  nyan.eat(); //~ ERROR does not implement any method in scope named `eat`
 }

diff --git a/src/test/compile-fail/extern-wrong-value-type.rs b/src/test/compile-fail/extern-wrong-value-type.rs
index 4daa7f71adf28e3c6a758941ac316286f546bad9..fbb0f6e46a1c4a8b2a553c31050eb13b362e2469 100644 (file)
--- a/src/test/compile-fail/extern-wrong-value-type.rs
+++ b/src/test/compile-fail/extern-wrong-value-type.rs
@@ -13,5 +13,5 @@
 
 fn main() {
     // extern functions are *u8 types
-    let _x: &fn() = f; //~ ERROR mismatched types: expected `&fn()` but found `*u8`
+    let _x: &fn() = f; //~ ERROR found `*u8`
 }

diff --git a/src/test/compile-fail/issue-4523.rs b/src/test/compile-fail/issue-4523.rs
index 6d072ce210e2d0241df18a11e8dcc97a0790ff4f..332db60c836fc3634615a483047842ca760f4a43 100644 (file)
--- a/src/test/compile-fail/issue-4523.rs
+++ b/src/test/compile-fail/issue-4523.rs
@@ -10,7 +10,7 @@
 
 fn foopy() {}
 
-static f: &'static fn() = foopy; //~ ERROR mismatched types: expected `&'static fn()`
+static f: &'static fn() = foopy; //~ ERROR found extern fn
 
 fn main () {
     f();

diff --git a/src/test/compile-fail/issue-4972.rs b/src/test/compile-fail/issue-4972.rs
index bd74199dabd865a4ea9a58d3d52223bec264e340..fcd15a2121931c37534dec8ff7ad85b56d89f0dc 100644 (file)
--- a/src/test/compile-fail/issue-4972.rs
+++ b/src/test/compile-fail/issue-4972.rs
@@ -16,8 +16,8 @@ pub enum TraitWrapper {
 
 fn get_tw_map<'lt>(tw: &'lt TraitWrapper) -> &'lt MyTrait {
     match *tw {
-        A(~ref map) => map, //~ ERROR mismatched types: expected `~MyTrait` but found a ~-box pattern
+        A(~ref map) => map, //~ ERROR found a ~-box pattern
     }
 }
 
-pub fn main() {}
\ No newline at end of file
+pub fn main() {}

diff --git a/src/test/compile-fail/map-types.rs b/src/test/compile-fail/map-types.rs
index f5d6e95fe2f4d15d8f1c474f95e284121dad53ee..f6fd8e29a4f4d274307b71439aaac90d8876b2db 100644 (file)
--- a/src/test/compile-fail/map-types.rs
+++ b/src/test/compile-fail/map-types.rs
@@ -17,5 +17,5 @@ fn main() {
     let x: @Map<~str, ~str> = @HashMap::new::<~str, ~str>() as
         @Map<~str, ~str>;
     let y: @Map<uint, ~str> = @x;
-    //~^ ERROR mismatched types: expected `@std::container::Map<uint,~str>`
+    //~^ ERROR expected trait std::container::Map but found @-ptr
 }

diff --git a/src/test/compile-fail/missing-do.rs b/src/test/compile-fail/missing-do.rs
index b5789d737716b6f465f27fb237834d35c4f05d14..e6a7698d0f07519326345507c16d9d0900dbb90e 100644 (file)
--- a/src/test/compile-fail/missing-do.rs
+++ b/src/test/compile-fail/missing-do.rs
@@ -13,7 +13,7 @@
 fn foo(f: &fn()) { f() }
 
 fn main() {
-    ~"" || 42; //~ ERROR binary operation || cannot be applied to type `~str`
-    foo || {}; //~ ERROR binary operation || cannot be applied to type `extern "Rust" fn(&fn())`
+    ~"" || 42; //~ ERROR binary operation || cannot be applied to type
+    foo || {}; //~ ERROR binary operation || cannot be applied to type
     //~^ NOTE did you forget the `do` keyword for the call?
 }