Update tests with the new diagnostic tweaks

Author: Jakub Bukaj

src/test/compile-fail/array-not-vector.rs

@@ -9,8 +9,8 @@
 // except according to those terms.
 
 fn main() {
-    let _x: int = [1i, 2, 3]; //~ ERROR expected int, found array
+    let _x: int = [1i, 2, 3]; //~ ERROR expected int, found array of 3 elements
 
     let x: &[int] = &[1, 2, 3];
-    let _y: &int = x; //~ ERROR expected int, found unsized array
+    let _y: &int = x; //~ ERROR expected int, found slice
 }

src/test/compile-fail/explicit-self-lifetime-mismatch.rs

@@ -16,10 +16,10 @@ struct Foo<'a,'b> {
 impl<'a,'b> Foo<'a,'b> {
     // The number of errors is related to the way invariance works.
     fn bar(self: Foo<'b,'a>) {}
-    //~^ ERROR mismatched types: expected `Foo<'a,'b>`, found `Foo<'b,'a>`
-    //~^^ ERROR mismatched types: expected `Foo<'a,'b>`, found `Foo<'b,'a>`
-    //~^^^ ERROR mismatched types: expected `Foo<'b,'a>`, found `Foo<'a,'b>`
-    //~^^^^ ERROR mismatched types: expected `Foo<'b,'a>`, found `Foo<'a,'b>`
+    //~^ ERROR mismatched types: expected `Foo<'a, 'b>`, found `Foo<'b, 'a>`
+    //~^^ ERROR mismatched types: expected `Foo<'a, 'b>`, found `Foo<'b, 'a>`
+    //~^^^ ERROR mismatched types: expected `Foo<'b, 'a>`, found `Foo<'a, 'b>`
+    //~^^^^ ERROR mismatched types: expected `Foo<'b, 'a>`, found `Foo<'a, 'b>`
 }
 
 fn main() {}

src/test/compile-fail/generic-type-params-name-repr.rs

@@ -29,13 +29,13 @@ fn main() {
 
     // Including cases where the default is using previous type params.
     let _: HashMap<String, int> = ();
-    //~^ ERROR mismatched types: expected `HashMap<collections::string::String,int>`, found `()`
+    //~^ ERROR mismatched types: expected `HashMap<collections::string::String, int>`, found `()`
     let _: HashMap<String, int, Hash<String>> = ();
-    //~^ ERROR mismatched types: expected `HashMap<collections::string::String,int>`, found `()`
+    //~^ ERROR mismatched types: expected `HashMap<collections::string::String, int>`, found `()`
 
     // But not when there's a different type in between.
     let _: Foo<A, int, C> = ();
-    //~^ ERROR mismatched types: expected `Foo<A,int>`, found `()`
+    //~^ ERROR mismatched types: expected `Foo<A, int>`, found `()`
 
     // And don't print <> at all when there's just defaults.
     let _: Foo<A, B, C> = ();

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

@@ -12,8 +12,8 @@ fn main() {
   let x = [1,2];
   let y = match x {
     [] => None,
-//~^ ERROR mismatched types: expected `[<generic integer #0>, ..2]`, found `[<generic #7>, ..0]`
-//         (expected array, found array)
+//~^ ERROR types: expected `[_#0i, ..2]`, found `[_#7, ..0]`
+//         (expected array of 2 elements, found array of 0 elements)
     [a,_] => Some(a)
   };
 }

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

@@ -12,7 +12,7 @@ use std::raw::Slice;
 
 fn main() {
     let Slice { data: data, len: len } = "foo";
-    //~^ ERROR mismatched types: expected `&str`, found `core::raw::Slice<<generic #3>>`
+    //~^ ERROR mismatched types: expected `&str`, found `core::raw::Slice<_>`
     //         (expected &-ptr, found struct core::raw::Slice)
 }
 

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

@@ -13,7 +13,7 @@ use std::raw::Slice;
 fn main() {
     match () {
         Slice { data: data, len: len } => (),
-        //~^ ERROR mismatched types: expected `()`, found `core::raw::Slice<<generic #3>>`
+        //~^ ERROR mismatched types: expected `()`, found `core::raw::Slice<_>`
         //         (expected (), found struct core::raw::Slice)
         _ => unreachable!()
     }

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

@@ -11,7 +11,7 @@
 fn main() {
     match None {
         Err(_) => ()
-        //~^ ERROR mismatched types: expected `core::option::Option<<generic #1>>`
-        //         , found `core::result::Result<<generic #2>,<generic #3>>`
+        //~^ ERROR mismatched types: expected `core::option::Option<_#1>`
+        //         , found `core::result::Result<_#2, _#3>`
     }
 }

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

@@ -12,7 +12,7 @@ fn main() {
     let a = if true {
         0
     } else if false {
-//~^ ERROR if may be missing an else clause: expected `()`, found `<generic integer #1>`
+//~^ ERROR if may be missing an else clause: expected `()`, found `_#1i`
         1
     };
 }

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

@@ -13,6 +13,6 @@
 const A: (int,int) = (4,2);
 fn main() {
     match 42 { A => () }
-    //~^ ERROR mismatched types: expected `<generic integer #0>`, found `(int,int)`
+    //~^ ERROR mismatched types: expected `_#0i`, found `(int, int)`
     //         (expected integral variable, found tuple)
 }

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

@@ -13,32 +13,32 @@ enum A { B, C }
 fn main() {
     match (true, false) {
         B => (),
-        //~^ ERROR mismatched types: expected `(bool,bool)`, found `A`
-        //         (expected tuple, found enum A)
+//~^ ERROR mismatched types: expected `(bool, bool)`, found `A` (expected tuple, found enum A)
         _ => ()
     }
 
     match (true, false) {
         (true, false, false) => ()
-        //~^ ERROR mismatched types: expected `(bool,bool)`,
-        //         found `(<generic #7>,<generic #8>,<generic #9>)`
-        //         (expected a tuple with 2 elements, found one with 3 elements)
+//~^ ERROR mismatched types: expected `(bool, bool)`, found `(_#9, _#10, _#11)`
+    }
+
+    match (true, false) {
+        (true, false, false) => ()
+//~^ ERROR (expected a tuple with 2 elements, found one with 3 elements)
     }
 
     match (true, false) {
         box (true, false) => ()
-        //~^ ERROR mismatched types: expected `(bool,bool)`, found `Box<<generic #15>>`
-        //         (expected tuple, found box)
+//~^ ERROR mismatched types: expected `(bool, bool)`, found `Box<_>` (expected tuple, found box)
     }
 
     match (true, false) {
         &(true, false) => ()
-        //~^ ERROR mismatched types: expected `(bool,bool)`, found `&<generic #21>`
-        //         (expected tuple, found &-ptr)
+//~^ ERROR mismatched types: expected `(bool, bool)`, found `&_` (expected tuple, found &-ptr)
     }
 
 
-    let v = [('a', 'b')   //~ ERROR expected function, found `(char,char)`
+    let v = [('a', 'b')   //~ ERROR expected function, found `(char, char)`
              ('c', 'd'),
              ('e', 'f')];