Improve test error message expectation

Author: ldm0

src/test/ui/issues/issue-24036.rs

@@ -10,7 +10,7 @@ fn closure_from_match() {
         2 => |c| c - 1,
         _ => |c| c - 1
     };
-    //~^^^^ ERROR 9:15: 9:16: type annotations needed [E0282]
+    //~^^^^ ERROR type annotations needed
 }
 
 fn main() { }

src/test/ui/issues/issue-46742-3.rs

@@ -9,7 +9,7 @@ fn main() {
         "-" => |a, b| (a - b + cap) as i32,
         _ => unimplemented!(),
     })(5, 5);
-    //~^^^ ERROR 9:16: 9:43: `match` arms have incompatible types [E0308]
+    //~^^^ ERROR `match` arms have incompatible types
 
 
     // We shouldn't coerce capturing closure to a non-capturing closure
@@ -18,7 +18,7 @@ fn main() {
         "-" => |a, b| (a - b + cap) as i32,
         _ => unimplemented!(),
     })(5, 5);
-    //~^^^ ERROR 18:16: 18:43: `match` arms have incompatible types [E0308]
+    //~^^^ ERROR `match` arms have incompatible types
 
 
     // We shouldn't coerce non-capturing closure to a capturing closure
@@ -27,13 +27,13 @@ fn main() {
         "-" => |a, b| (a - b) as i32,
         _ => unimplemented!(),
     })(5, 5);
-    //~^^^ ERROR 27:16: 27:37: `match` arms have incompatible types [E0308]
+    //~^^^ ERROR `match` arms have incompatible types
 
     // We shouldn't coerce capturing closure to a capturing closure
     let _ = (match "+" {
         "+" => |a, b| (a + b + cap) as i32,
         "-" => |a, b| (a - b + cap) as i32,
         _ => unimplemented!(),
     })(5, 5);
-    //~^^^ ERROR 35:16: 35:43: `match` arms have incompatible types [E0308]
+    //~^^^ ERROR `match` arms have incompatible types
 }