Fix many tests.

Fallout from the change to compiletest that makes it not ignore
compiler errors that don't have an error pattern.

Author: Nick Hamann

src/test/compile-fail/arg-count-mismatch.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,8 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: parameters were supplied
-
 fn f(x: isize) { }
 
-fn main() { let i: (); i = f(); }
+fn main() {
+    let i: ();
+    i = f(); //~ ERROR this function takes 1 parameter but 0 parameters were supplied
+}

src/test/compile-fail/arg-type-mismatch.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -9,8 +9,9 @@
 // except according to those terms.
 
 
-// error-pattern: mismatched types
-
 fn f(x: isize) { }
 
-fn main() { let i: (); i = f(()); }
+fn main() {
+    let i: ();
+    i = f(()); //~ ERROR mismatched types
+}

src/test/compile-fail/attr-bad-crate-attr.rc

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,7 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: expected item
-
 #![attr = "val"]
 #[attr = "val"] // Unterminated
+//~^ ERROR expected item after attributes

src/test/compile-fail/bad-env-capture.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,9 +8,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: can't capture dynamic environment in a fn item;
 fn foo() {
     let x: isize;
-    fn bar() { log(debug, x); }
+    fn bar() {
+        println!("{}", x);
+        //~^ ERROR can't capture dynamic environment in a fn item; use the || { ... } closure
+        // form instead
+        //~| ERROR unresolved name `x`
+    }
 }
 fn main() { foo(); }

src/test/compile-fail/bad-env-capture2.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,8 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: can't capture dynamic environment in a fn item;
 fn foo(x: isize) {
-    fn bar() { log(debug, x); }
+    fn bar() {
+        println!("{}", x);
+        //~^ ERROR can't capture dynamic environment in a fn item; use the || { ... } closure
+        // form instead
+        //~| ERROR unresolved name `x`
+    }
 }
 fn main() { foo(2); }

src/test/compile-fail/bad-env-capture3.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,10 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: can't capture dynamic environment in a fn item;
 fn foo(x: isize) {
     fn mth() {
-        fn bar() { log(debug, x); }
+        fn bar() {
+            println!("{}", x);
+            //~^ ERROR can't capture dynamic environment in a fn item; use the || { ... } closure
+            // form instead
+            //~| ERROR unresolved name `x`
+        }
     }
 }
 

src/test/compile-fail/bad-expr-path.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,8 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: unresolved name `m1::arguments`. Did you mean `arguments`?
-
 mod m1 {}
 
-fn main(arguments: Vec<String>) { log(debug, m1::arguments); }
+fn main(arguments: Vec<String>) {
+    println!("{:?}", m1::arguments);
+    //~^ ERROR unresolved name `m1::arguments`. Did you mean `arguments`?
+}

src/test/compile-fail/bad-expr-path2.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,12 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: unresolved name `m1::arguments`. Did you mean `arguments`?
-
 mod m1 {
     pub mod arguments {}
 }
 
 fn main(arguments: Vec<String>) {
-    log(debug, m1::arguments);
+    println!("{:?}", m1::arguments);
+    //~^ ERROR unresolved name `m1::arguments`. Did you mean `arguments`?
 }

src/test/compile-fail/bad-module.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: unresolved name
-
-fn main() { let foo = thing::len(Vec::new()); }
+fn main() {
+    let foo = thing::len(Vec::new());
+    //~^ ERROR failed to resolve. Use of undeclared type or module `thing`
+    //~| ERROR unresolved name `thing::len`
+}

src/test/compile-fail/binop-bitxor-str.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,6 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:`^` cannot be applied to type `collections::string::String`
-
 fn main() { let x = "a".to_string() ^ "b".to_string(); }
+//~^ ERROR binary operation `^` cannot be applied to type `collections::string::String`

src/test/compile-fail/binop-mul-bool.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,6 +8,5 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:`*` cannot be applied to type `bool`
-
 fn main() { let x = true * false; }
+//~^ ERROR binary operation `*` cannot be applied to type `bool`

src/test/compile-fail/bogus-tag.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,15 +8,12 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-// error-pattern: unresolved
-
 enum color { rgb(isize, isize, isize), rgba(isize, isize, isize, isize), }
 
 fn main() {
-    let red: color = rgb(255, 0, 0);
+    let red: color = rgb(255, 0, 0); //~ ERROR unresolved name `rgb`
     match red {
-      rgb(r, g, b) => { println!("rgb"); }
-      hsl(h, s, l) => { println!("hsl"); }
+      rgb(r, g, b) => { println!("rgb"); } //~ ERROR unresolved enum variant, struct or const `rgb`
+      hsl(h, s, l) => { println!("hsl"); } //~ ERROR unresolved enum variant, struct or const `hsl`
     }
 }

src/test/compile-fail/capture1.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,10 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-
-// error-pattern: can't capture dynamic environment in a fn item;
-
 fn main() {
     let bar: isize = 5;
     fn foo() -> isize { return bar; }
+    //~^ ERROR can't capture dynamic environment in a fn item; use the || { ... } closure
+    // form instead
+    //~| ERROR unresolved name `bar`
 }

src/test/compile-fail/cast-as-bool.rs

@@ -1,4 +1,4 @@
-// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2013-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,5 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: cannot cast as `bool`, compare with zero instead
-fn main() { let u = (5 as bool); }
+fn main() { let u = (5 as bool); } //~ ERROR cannot cast as `bool`, compare with zero instead

src/test/compile-fail/cast-from-nil.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,5 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: non-scalar cast: `()` as `u32`
-fn main() { let u = (assert!(true) as u32); }
+fn main() {
+    let u = (assert!(true) as u32); //~ ERROR non-scalar cast: `()` as `u32`
+}

src/test/compile-fail/cast-to-nil.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,5 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: non-scalar cast: `u32` as `()`
-fn main() { let u = 0u32 as (); }
+fn main() {
+    let u = 0u32 as (); //~ ERROR non-scalar cast: `u32` as `()`
+}

src/test/compile-fail/cfg-attr-cfg-2.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 //
 // error-pattern: main function not found
+// error-pattern: aborting due to previous error
 // compile-flags: --cfg foo
 
 // main is conditionally compiled, but the conditional compilation

src/test/compile-fail/cfg-in-crate-1.rs

@@ -1,4 +1,4 @@
-// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2014-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern:main function not found
+// error-pattern: main function not found
+// error-pattern: aborting due to previous error
 
 #![cfg(bar)]

src/test/compile-fail/const-eval-overflow-2.rs

@@ -24,7 +24,7 @@ const NEG_NEG_128: i8 = -NEG_128;
 
 fn main() {
     match -128i8 {
-        NEG_NEG_128 => println!("A"),
+        NEG_NEG_128 => println!("A"), //~ NOTE in pattern here
         _ => println!("B"),
     }
 }

src/test/compile-fail/const-eval-overflow-3.rs

@@ -17,8 +17,6 @@
 // self-hosted and a cross-compiled setup; therefore resorting to
 // error-pattern for now.
 
-// error-pattern: expected constant integer for repeat count, but attempted to add with overflow
-
 #![allow(unused_imports)]
 
 use std::fmt;
@@ -28,6 +26,8 @@ use std::{u8, u16, u32, u64, usize};
 const A_I8_I
     : [u32; (i8::MAX as usize) + 1]
     = [0; (i8::MAX + 1) as usize];
+    //~^ ERROR expected constant integer for repeat count, but attempted to add with overflow
+
 
 fn main() {
     foo(&A_I8_I[..]);

src/test/compile-fail/const-eval-overflow-3b.rs

@@ -21,8 +21,6 @@
 // self-hosted and a cross-compiled setup; therefore resorting to
 // error-pattern for now.
 
-// error-pattern: mismatched types
-
 #![allow(unused_imports)]
 
 use std::fmt;
@@ -32,6 +30,9 @@ use std::{u8, u16, u32, u64, usize};
 const A_I8_I
     : [u32; (i8::MAX as usize) + 1]
     = [0; (i8::MAX + 1u8) as usize];
+    //~^ ERROR mismatched types
+    //~| ERROR the trait `core::ops::Add<u8>` is not implemented for the type `i8`
+    //~| ERROR the trait `core::ops::Add<u8>` is not implemented for the type `i8`
 
 fn main() {
     foo(&A_I8_I[..]);

src/test/compile-fail/const-recursive.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -8,9 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-// error-pattern: recursive constant
 static a: isize = b;
+//~^ ERROR recursive constant
 static b: isize = a;
-
-fn main() {
-}
+//~^ ERROR recursive constant
+fn main() {}

src/test/compile-fail/crateresolve1.rs

@@ -1,4 +1,4 @@
-// Copyright 2012 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -11,7 +11,9 @@
 // aux-build:crateresolve1-1.rs
 // aux-build:crateresolve1-2.rs
 // aux-build:crateresolve1-3.rs
-// error-pattern:multiple matching crates for `crateresolve1`
+// error-pattern: multiple matching crates for `crateresolve1`
+// error-pattern: can't find crate for `crateresolve1`
+// error-pattern: aborting due to 2 previous errors
 
 extern crate crateresolve1;