Update tests

12 files changed, 34 insertions, 34 deletions

diff --git a/src/test/ui/pattern/deny-irrefutable-let-patterns.stderr b/src/test/ui/pattern/deny-irrefutable-let-patterns.stderr
index ad8cc2ef897..b32cf8cbb0e 100644
--- a/src/test/ui/pattern/deny-irrefutable-let-patterns.stderr
+++ b/src/test/ui/pattern/deny-irrefutable-let-patterns.stderr
@@ -1,7 +1,7 @@
 error: irrefutable if-let pattern
   --> $DIR/deny-irrefutable-let-patterns.rs:4:5
    |
-LL |     if let _ = 5 {} //~ ERROR irrefutable if-let pattern
+LL |     if let _ = 5 {}
    |     ^^^^^^^^^^^^^^^
    |
 note: lint level defined here
@@ -13,7 +13,7 @@ LL | #![deny(irrefutable_let_patterns)]
 error: irrefutable while-let pattern
   --> $DIR/deny-irrefutable-let-patterns.rs:6:5
    |
-LL | /     while let _ = 5 { //~ ERROR irrefutable while-let pattern
+LL | /     while let _ = 5 {
 LL | |         break;
 LL | |     }
    | |_____^
diff --git a/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr b/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr
index 7dbe23a8f28..0c5824be95d 100644
--- a/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr
+++ b/src/test/ui/pattern/pat-shadow-in-nested-binding.stderr
@@ -4,7 +4,7 @@ error[E0530]: let bindings cannot shadow tuple structs
 LL | struct foo(usize);
    | ------------------ the tuple struct `foo` is defined here
 ...
-LL |     let (foo, _) = (2, 3); //~ ERROR let bindings cannot shadow tuple structs
+LL |     let (foo, _) = (2, 3);
    |          ^^^ cannot be named the same as a tuple struct
 
 error: aborting due to previous error
diff --git a/src/test/ui/pattern/pat-tuple-bad-type.stderr b/src/test/ui/pattern/pat-tuple-bad-type.stderr
index 28aa52856c5..84b9a622431 100644
--- a/src/test/ui/pattern/pat-tuple-bad-type.stderr
+++ b/src/test/ui/pattern/pat-tuple-bad-type.stderr
@@ -4,7 +4,7 @@ error[E0282]: type annotations needed
 LL |     let x;
    |         - consider giving `x` a type
 ...
-LL |         (..) => {} //~ ERROR type annotations needed
+LL |         (..) => {}
    |         ^^^^ cannot infer type
    |
    = note: type must be known at this point
@@ -12,7 +12,7 @@ LL |         (..) => {} //~ ERROR type annotations needed
 error[E0308]: mismatched types
   --> $DIR/pat-tuple-bad-type.rs:10:9
    |
-LL |         (..) => {} //~ ERROR mismatched types
+LL |         (..) => {}
    |         ^^^^ expected u8, found ()
    |
    = note: expected type `u8`
diff --git a/src/test/ui/pattern/pat-tuple-overfield.stderr b/src/test/ui/pattern/pat-tuple-overfield.stderr
index 4bd374affb3..9bf14e15fce 100644
--- a/src/test/ui/pattern/pat-tuple-overfield.stderr
+++ b/src/test/ui/pattern/pat-tuple-overfield.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/pat-tuple-overfield.rs:5:9
    |
-LL |         (1, 2, 3, 4) => {} //~ ERROR mismatched types
+LL |         (1, 2, 3, 4) => {}
    |         ^^^^^^^^^^^^ expected a tuple with 3 elements, found one with 4 elements
    |
    = note: expected type `({integer}, {integer}, {integer})`
@@ -10,7 +10,7 @@ LL |         (1, 2, 3, 4) => {} //~ ERROR mismatched types
 error[E0308]: mismatched types
   --> $DIR/pat-tuple-overfield.rs:6:9
    |
-LL |         (1, 2, .., 3, 4) => {} //~ ERROR mismatched types
+LL |         (1, 2, .., 3, 4) => {}
    |         ^^^^^^^^^^^^^^^^ expected a tuple with 3 elements, found one with 4 elements
    |
    = note: expected type `({integer}, {integer}, {integer})`
diff --git a/src/test/ui/pattern/patkind-litrange-no-expr.stderr b/src/test/ui/pattern/patkind-litrange-no-expr.stderr
index 4caafa7d3e8..7474d326793 100644
--- a/src/test/ui/pattern/patkind-litrange-no-expr.stderr
+++ b/src/test/ui/pattern/patkind-litrange-no-expr.stderr
@@ -1,13 +1,13 @@
 error: arbitrary expressions aren't allowed in patterns
   --> $DIR/patkind-litrange-no-expr.rs:20:13
    |
-LL |     Arith = 1 + 1, //~ ERROR arbitrary expressions aren't allowed in patterns
+LL |     Arith = 1 + 1,
    |             ^^^^^
 
 error[E0029]: only char and numeric types are allowed in range patterns
   --> $DIR/patkind-litrange-no-expr.rs:20:13
    |
-LL |     Arith = 1 + 1, //~ ERROR arbitrary expressions aren't allowed in patterns
+LL |     Arith = 1 + 1,
    |             ^^^^^ ranges require char or numeric types
    |
    = note: start type: {integer}
diff --git a/src/test/ui/pattern/pattern-binding-disambiguation.stderr b/src/test/ui/pattern/pattern-binding-disambiguation.stderr
index 958934c301f..faa0d7c3074 100644
--- a/src/test/ui/pattern/pattern-binding-disambiguation.stderr
+++ b/src/test/ui/pattern/pattern-binding-disambiguation.stderr
@@ -4,7 +4,7 @@ error[E0530]: match bindings cannot shadow tuple structs
 LL | struct TupleStruct();
    | --------------------- the tuple struct `TupleStruct` is defined here
 ...
-LL |         TupleStruct => {} //~ ERROR match bindings cannot shadow tuple structs
+LL |         TupleStruct => {}
    |         ^^^^^^^^^^^ cannot be named the same as a tuple struct
 
 error[E0530]: match bindings cannot shadow tuple variants
@@ -13,7 +13,7 @@ error[E0530]: match bindings cannot shadow tuple variants
 LL | use E::*;
    |     ---- the tuple variant `TupleVariant` is imported here
 ...
-LL |         TupleVariant => {} //~ ERROR match bindings cannot shadow tuple variants
+LL |         TupleVariant => {}
    |         ^^^^^^^^^^^^ cannot be named the same as a tuple variant
 
 error[E0530]: match bindings cannot shadow struct variants
@@ -22,7 +22,7 @@ error[E0530]: match bindings cannot shadow struct variants
 LL | use E::*;
    |     ---- the struct variant `BracedVariant` is imported here
 ...
-LL |         BracedVariant => {} //~ ERROR match bindings cannot shadow struct variants
+LL |         BracedVariant => {}
    |         ^^^^^^^^^^^^^ cannot be named the same as a struct variant
 
 error[E0530]: match bindings cannot shadow statics
@@ -31,7 +31,7 @@ error[E0530]: match bindings cannot shadow statics
 LL | static STATIC: () = ();
    | ----------------------- the static `STATIC` is defined here
 ...
-LL |         STATIC => {} //~ ERROR match bindings cannot shadow statics
+LL |         STATIC => {}
    |         ^^^^^^ cannot be named the same as a static
 
 error[E0530]: let bindings cannot shadow tuple structs
@@ -40,7 +40,7 @@ error[E0530]: let bindings cannot shadow tuple structs
 LL | struct TupleStruct();
    | --------------------- the tuple struct `TupleStruct` is defined here
 ...
-LL |     let TupleStruct = doesnt_matter; //~ ERROR let bindings cannot shadow tuple structs
+LL |     let TupleStruct = doesnt_matter;
    |         ^^^^^^^^^^^ cannot be named the same as a tuple struct
 
 error[E0530]: let bindings cannot shadow tuple variants
@@ -49,7 +49,7 @@ error[E0530]: let bindings cannot shadow tuple variants
 LL | use E::*;
    |     ---- the tuple variant `TupleVariant` is imported here
 ...
-LL |     let TupleVariant = doesnt_matter; //~ ERROR let bindings cannot shadow tuple variants
+LL |     let TupleVariant = doesnt_matter;
    |         ^^^^^^^^^^^^ cannot be named the same as a tuple variant
 
 error[E0530]: let bindings cannot shadow struct variants
@@ -58,7 +58,7 @@ error[E0530]: let bindings cannot shadow struct variants
 LL | use E::*;
    |     ---- the struct variant `BracedVariant` is imported here
 ...
-LL |     let BracedVariant = doesnt_matter; //~ ERROR let bindings cannot shadow struct variants
+LL |     let BracedVariant = doesnt_matter;
    |         ^^^^^^^^^^^^^ cannot be named the same as a struct variant
 
 error[E0530]: let bindings cannot shadow statics
@@ -67,7 +67,7 @@ error[E0530]: let bindings cannot shadow statics
 LL | static STATIC: () = ();
    | ----------------------- the static `STATIC` is defined here
 ...
-LL |     let STATIC = doesnt_matter; //~ ERROR let bindings cannot shadow statics
+LL |     let STATIC = doesnt_matter;
    |         ^^^^^^ cannot be named the same as a static
 
 error: aborting due to 8 previous errors
diff --git a/src/test/ui/pattern/pattern-error-continue.stderr b/src/test/ui/pattern/pattern-error-continue.stderr
index 654814afcfe..11e0c31cfa6 100644
--- a/src/test/ui/pattern/pattern-error-continue.stderr
+++ b/src/test/ui/pattern/pattern-error-continue.stderr
@@ -1,13 +1,13 @@
 error[E0433]: failed to resolve: use of undeclared type or module `E`
   --> $DIR/pattern-error-continue.rs:35:9
    |
-LL |         E::V => {} //~ ERROR failed to resolve: use of undeclared type or module `E`
+LL |         E::V => {}
    |         ^ use of undeclared type or module `E`
 
 error[E0532]: expected tuple struct/variant, found unit variant `A::D`
   --> $DIR/pattern-error-continue.rs:18:9
    |
-LL |         A::D(_) => (),       //~ ERROR expected tuple struct/variant, found unit variant `A::D`
+LL |         A::D(_) => (),
    |         ^^^-
    |            |
    |            help: a tuple variant with a similar name exists: `B`
@@ -15,7 +15,7 @@ LL |         A::D(_) => (),       //~ ERROR expected tuple struct/variant, found
 error[E0023]: this pattern has 3 fields, but the corresponding tuple variant has 2 fields
   --> $DIR/pattern-error-continue.rs:17:9
    |
-LL |         A::B(_, _, _) => (), //~ ERROR this pattern has 3 fields, but
+LL |         A::B(_, _, _) => (),
    |         ^^^^^^^^^^^^^ expected 2 fields, found 3
 
 error[E0308]: mismatched types
diff --git a/src/test/ui/pattern/pattern-ident-path-generics.stderr b/src/test/ui/pattern/pattern-ident-path-generics.stderr
index 278b3d19d8b..bfc10c5f866 100644
--- a/src/test/ui/pattern/pattern-ident-path-generics.stderr
+++ b/src/test/ui/pattern/pattern-ident-path-generics.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/pattern-ident-path-generics.rs:3:9
    |
-LL |         None::<isize> => {}   //~ ERROR mismatched types
+LL |         None::<isize> => {}
    |         ^^^^^^^^^^^^^ expected &str, found isize
    |
    = note: expected type `std::option::Option<&str>`
diff --git a/src/test/ui/pattern/pattern-tyvar.stderr b/src/test/ui/pattern/pattern-tyvar.stderr
index 69cd552aabd..54834703467 100644
--- a/src/test/ui/pattern/pattern-tyvar.stderr
+++ b/src/test/ui/pattern/pattern-tyvar.stderr
@@ -3,7 +3,7 @@ error[E0308]: mismatched types
    |
 LL |     match t {
    |           - this match expression has type `std::option::Option<std::vec::Vec<isize>>`
-LL |       Bar::T1(_, Some::<isize>(x)) => { //~ ERROR mismatched types
+LL |       Bar::T1(_, Some::<isize>(x)) => {
    |                  ^^^^^^^^^^^^^^^^ expected struct `std::vec::Vec`, found isize
    |
    = note: expected type `std::option::Option<std::vec::Vec<isize>>`
diff --git a/src/test/ui/pattern/slice-pattern-const-2.stderr b/src/test/ui/pattern/slice-pattern-const-2.stderr
index 95651ccc401..e2c408a90e4 100644
--- a/src/test/ui/pattern/slice-pattern-const-2.stderr
+++ b/src/test/ui/pattern/slice-pattern-const-2.stderr
@@ -1,7 +1,7 @@
 error: unreachable pattern
   --> $DIR/slice-pattern-const-2.rs:9:9
    |
-LL |         [4, 5, 6, 7] => (), //~ ERROR unreachable pattern
+LL |         [4, 5, 6, 7] => (),
    |         ^^^^^^^^^^^^
    |
 note: lint level defined here
@@ -13,13 +13,13 @@ LL | #![deny(unreachable_patterns)]
 error: unreachable pattern
   --> $DIR/slice-pattern-const-2.rs:15:9
    |
-LL |         [4, 5, 6, 7] => (), //~ ERROR unreachable pattern
+LL |         [4, 5, 6, 7] => (),
    |         ^^^^^^^^^^^^
 
 error: unreachable pattern
   --> $DIR/slice-pattern-const-2.rs:28:9
    |
-LL |         FOO => (), //~ ERROR unreachable pattern
+LL |         FOO => (),
    |         ^^^
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/pattern/slice-pattern-const-3.stderr b/src/test/ui/pattern/slice-pattern-const-3.stderr
index 531bbbc84d0..eab4fc3f086 100644
--- a/src/test/ui/pattern/slice-pattern-const-3.stderr
+++ b/src/test/ui/pattern/slice-pattern-const-3.stderr
@@ -1,7 +1,7 @@
 error: unreachable pattern
   --> $DIR/slice-pattern-const-3.rs:28:9
    |
-LL |         FOO => (), //~ ERROR unreachable pattern
+LL |         FOO => (),
    |         ^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/pattern/slice-pattern-const.stderr b/src/test/ui/pattern/slice-pattern-const.stderr
index 412e0158c01..2dd10a0478a 100644
--- a/src/test/ui/pattern/slice-pattern-const.stderr
+++ b/src/test/ui/pattern/slice-pattern-const.stderr
@@ -1,7 +1,7 @@
 error: unreachable pattern
   --> $DIR/slice-pattern-const.rs:9:9
    |
-LL |         [84, 69, 83, 84] => (), //~ ERROR unreachable pattern
+LL |         [84, 69, 83, 84] => (),
    |         ^^^^^^^^^^^^^^^^
    |
 note: lint level defined here
@@ -13,43 +13,43 @@ LL | #![deny(unreachable_patterns)]
 error: unreachable pattern
   --> $DIR/slice-pattern-const.rs:15:9
    |
-LL |         [84, 69, 83, 84] => (), //~ ERROR unreachable pattern
+LL |         [84, 69, 83, 84] => (),
    |         ^^^^^^^^^^^^^^^^
 
 error: unreachable pattern
   --> $DIR/slice-pattern-const.rs:21:9
    |
-LL |         MAGIC_TEST => (), //~ ERROR unreachable pattern
+LL |         MAGIC_TEST => (),
    |         ^^^^^^^^^^
 
 error: unreachable pattern
   --> $DIR/slice-pattern-const.rs:28:9
    |
-LL |         FOO => (), //~ ERROR unreachable pattern
+LL |         FOO => (),
    |         ^^^
 
 error: unreachable pattern
   --> $DIR/slice-pattern-const.rs:35:9
    |
-LL |         BAR => (), //~ ERROR unreachable pattern
+LL |         BAR => (),
    |         ^^^
 
 error: unreachable pattern
   --> $DIR/slice-pattern-const.rs:43:9
    |
-LL |         BOO => (), //~ ERROR unreachable pattern
+LL |         BOO => (),
    |         ^^^
 
 error: unreachable pattern
   --> $DIR/slice-pattern-const.rs:44:9
    |
-LL |         b"" => (), //~ ERROR unreachable pattern
+LL |         b"" => (),
    |         ^^^
 
 error: unreachable pattern
   --> $DIR/slice-pattern-const.rs:45:9
    |
-LL |         _ => (), //~ ERROR unreachable pattern
+LL |         _ => (),
    |         ^
 
 error: aborting due to 8 previous errors