Update tests with the new error messages

Author: Jakub Bukaj

src/test/compile-fail/bad-bang-ann-3.rs

@@ -11,8 +11,7 @@
 // Tests that a function with a ! annotation always actually fails
 
 fn bad_bang(i: uint) -> ! {
-    return 7u;
-    //~^ ERROR expected `!`, found `uint`
+    return 7u; //~ ERROR `return` in a function declared as diverging [E0166]
 }
 
 fn main() { bad_bang(5u); }

src/test/compile-fail/bad-bang-ann.rs

@@ -10,9 +10,8 @@
 
 // Tests that a function with a ! annotation always actually fails
 
-fn bad_bang(i: uint) -> ! {
+fn bad_bang(i: uint) -> ! { //~ ERROR computation may converge in a function marked as diverging
     if i < 0u { } else { fail!(); }
-    //~^ ERROR expected `!`, found `()`
 }
 
 fn main() { bad_bang(5u); }

src/test/compile-fail/bang-tailexpr.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-fn f() -> ! {
-    3i //~ ERROR expected `!`, found `int`
+fn f() -> ! { //~ ERROR computation may converge in a function marked as diverging
+    3i
 }
 fn main() { }

src/test/run-fail/binop-fail-3.rs renamed to src/test/compile-fail/binop-fail-3.rs

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:quux
 fn foo() -> ! { fail!("quux"); }
-fn main() { foo() == foo(); }
+fn main() {
+    foo() //~ ERROR the type of this value must be known in this context
+    ==
+    foo();
+}

src/test/compile-fail/closure-that-fails.rs

@@ -14,7 +14,7 @@ fn main() {
     // Type inference didn't use to be able to handle this:
     foo(|| fail!());
     foo(|| -> ! fail!());
-    foo(|| 22); //~ ERROR mismatched types
-    foo(|| -> ! 22); //~ ERROR mismatched types
-    let x = || -> ! 1; //~ ERROR mismatched types
+    foo(|| 22i); //~ ERROR computation may converge in a function marked as diverging
+    foo(|| -> ! 22i); //~ ERROR computation may converge in a function marked as diverging
+    let x = || -> ! 1i; //~ ERROR computation may converge in a function marked as diverging
 }

src/test/compile-fail/index-bot.rs

@@ -9,5 +9,5 @@
 // except according to those terms.
 
 fn main() {
-    (return)[0u]; //~ ERROR cannot index a value of type `!`
+    (return)[0u]; //~ ERROR the type of this value must be known in this context
 }

src/test/compile-fail/issue-13847.rs

@@ -9,5 +9,5 @@
 // except according to those terms.
 
 fn main() {
-    return.is_failure //~ ERROR unconstrained type variable
+    return.is_failure //~ ERROR the type of this value must be known in this context
 }

src/test/compile-fail/issue-15207.rs

@@ -9,5 +9,9 @@
 // except according to those terms.
 
 fn main() {
-    loop { break.push(1); } //~ ERROR type `!` does not implement any method in scope named `push`
+    loop {
+        break.push(1) //~ ERROR the type of this value must be known in this context
+        //~^ ERROR multiple applicable methods in scope
+        ;
+    }
 }

src/test/compile-fail/issue-15965.rs

@@ -9,5 +9,10 @@
 // except according to those terms.
 
 fn main() {
-    return { return () } (); //~ ERROR expected function, found `!`
+    return
+        { return () } //~ ERROR the type of this value must be known in this context
+    () //~^ ERROR the type of this value must be known in this context
+//~^^ ERROR notation; the first type parameter for the function trait is neither a tuple nor unit
+//~^^^ ERROR overloaded calls are experimental
+    ;
 }

src/test/compile-fail/issue-17373.rs

@@ -9,5 +9,6 @@
 // except according to those terms.
 
 fn main() {
-    *return; //~ ERROR type `!` cannot be dereferenced
+    *return //~ ERROR the type of this value must be known in this context
+    ;
 }