Update tests

8 files changed, 13 insertions, 13 deletions

diff --git a/src/test/ui/enum/enum-and-module-in-same-scope.stderr b/src/test/ui/enum/enum-and-module-in-same-scope.stderr
index 5f42af8f260..538898c2f2a 100644
--- a/src/test/ui/enum/enum-and-module-in-same-scope.stderr
+++ b/src/test/ui/enum/enum-and-module-in-same-scope.stderr
@@ -4,7 +4,7 @@ error[E0428]: the name `Foo` is defined multiple times
 LL | enum Foo {
    | -------- previous definition of the type `Foo` here
 ...
-LL | mod Foo { //~ ERROR the name `Foo` is defined multiple times
+LL | mod Foo {
    | ^^^^^^^ `Foo` redefined here
    |
    = note: `Foo` must be defined only once in the type namespace of this module
diff --git a/src/test/ui/enum/enum-discrim-autosizing.stderr b/src/test/ui/enum/enum-discrim-autosizing.stderr
index 67b0d75d787..8848f984cfb 100644
--- a/src/test/ui/enum/enum-discrim-autosizing.stderr
+++ b/src/test/ui/enum/enum-discrim-autosizing.stderr
@@ -3,7 +3,7 @@ error[E0081]: discriminant value `0` already exists
    |
 LL |     Au64 = 0,
    |            - first use of `0`
-LL |     Bu64 = 0x8000_0000_0000_0000 //~ERROR already exists
+LL |     Bu64 = 0x8000_0000_0000_0000
    |            ^^^^^^^^^^^^^^^^^^^^^ enum already has `0`
 
 error: aborting due to previous error
diff --git a/src/test/ui/enum/enum-discrim-too-small2.stderr b/src/test/ui/enum/enum-discrim-too-small2.stderr
index 31ca01b86bd..6340f5a856e 100644
--- a/src/test/ui/enum/enum-discrim-too-small2.stderr
+++ b/src/test/ui/enum/enum-discrim-too-small2.stderr
@@ -1,7 +1,7 @@
 error: literal out of range for i8
   --> $DIR/enum-discrim-too-small2.rs:8:11
    |
-LL |     Ci8 = 223, //~ ERROR literal out of range for i8
+LL |     Ci8 = 223,
    |           ^^^
    |
 note: lint level defined here
@@ -13,19 +13,19 @@ LL | #![deny(overflowing_literals)]
 error: literal out of range for i16
   --> $DIR/enum-discrim-too-small2.rs:15:12
    |
-LL |     Ci16 = 55555, //~ ERROR literal out of range for i16
+LL |     Ci16 = 55555,
    |            ^^^^^
 
 error: literal out of range for i32
   --> $DIR/enum-discrim-too-small2.rs:22:12
    |
-LL |     Ci32 = 3_000_000_000, //~ ERROR literal out of range for i32
+LL |     Ci32 = 3_000_000_000,
    |            ^^^^^^^^^^^^^
 
 error: literal out of range for i64
   --> $DIR/enum-discrim-too-small2.rs:29:12
    |
-LL |     Ci64 = 9223372036854775809, //~ ERROR literal out of range for i64
+LL |     Ci64 = 9223372036854775809,
    |            ^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/enum/enum-in-scope.stderr b/src/test/ui/enum/enum-in-scope.stderr
index cd0100ec2fc..49a01abcbd6 100644
--- a/src/test/ui/enum/enum-in-scope.stderr
+++ b/src/test/ui/enum/enum-in-scope.stderr
@@ -4,7 +4,7 @@ error[E0530]: let bindings cannot shadow tuple structs
 LL | struct hello(isize);
    | -------------------- the tuple struct `hello` is defined here
 ...
-LL |     let hello = 0; //~ERROR let bindings cannot shadow tuple structs
+LL |     let hello = 0;
    |         ^^^^^ cannot be named the same as a tuple struct
 
 error: aborting due to previous error
diff --git a/src/test/ui/enum/enum-size-variance.stderr b/src/test/ui/enum/enum-size-variance.stderr
index 5cc0a0d7a8f..1ebd9b6806f 100644
--- a/src/test/ui/enum/enum-size-variance.stderr
+++ b/src/test/ui/enum/enum-size-variance.stderr
@@ -1,7 +1,7 @@
 warning: enum variant is more than three times larger (32 bytes) than the next largest
   --> $DIR/enum-size-variance.rs:18:5
    |
-LL |     L(i64, i64, i64, i64), //~ WARNING three times larger
+LL |     L(i64, i64, i64, i64),
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
 note: lint level defined here
diff --git a/src/test/ui/enum/enum-to-float-cast-2.stderr b/src/test/ui/enum/enum-to-float-cast-2.stderr
index 42d08a11ed1..2bc414098dc 100644
--- a/src/test/ui/enum/enum-to-float-cast-2.stderr
+++ b/src/test/ui/enum/enum-to-float-cast-2.stderr
@@ -1,7 +1,7 @@
 error[E0606]: casting `E` as `f32` is invalid
   --> $DIR/enum-to-float-cast-2.rs:14:13
    |
-LL |     let a = E::L0 as f32;  //~ ERROR casting
+LL |     let a = E::L0 as f32;
    |             ^^^^^^^^^^^^
    |
    = help: cast through an integer first
@@ -9,7 +9,7 @@ LL |     let a = E::L0 as f32;  //~ ERROR casting
 error[E0606]: casting `F` as `f32` is invalid
   --> $DIR/enum-to-float-cast-2.rs:15:13
    |
-LL |     let c = F::H1 as f32;  //~ ERROR casting
+LL |     let c = F::H1 as f32;
    |             ^^^^^^^^^^^^
    |
    = help: cast through an integer first
diff --git a/src/test/ui/enum/enum-to-float-cast.stderr b/src/test/ui/enum/enum-to-float-cast.stderr
index e6cd2ed4d0d..191606d8dc5 100644
--- a/src/test/ui/enum/enum-to-float-cast.stderr
+++ b/src/test/ui/enum/enum-to-float-cast.stderr
@@ -1,7 +1,7 @@
 error[E0606]: casting `E` as `f32` is invalid
   --> $DIR/enum-to-float-cast.rs:13:18
    |
-LL | static C0: f32 = E::L0 as f32; //~ ERROR casting
+LL | static C0: f32 = E::L0 as f32;
    |                  ^^^^^^^^^^^^
    |
    = help: cast through an integer first
@@ -9,7 +9,7 @@ LL | static C0: f32 = E::L0 as f32; //~ ERROR casting
 error[E0606]: casting `F` as `f32` is invalid
   --> $DIR/enum-to-float-cast.rs:14:18
    |
-LL | static C1: f32 = F::H1 as f32; //~ ERROR casting
+LL | static C1: f32 = F::H1 as f32;
    |                  ^^^^^^^^^^^^
    |
    = help: cast through an integer first
diff --git a/src/test/ui/enum/enum-variant-type-2.stderr b/src/test/ui/enum/enum-variant-type-2.stderr
index 3e7a4edd66e..7e8453c61f6 100644
--- a/src/test/ui/enum/enum-variant-type-2.stderr
+++ b/src/test/ui/enum/enum-variant-type-2.stderr
@@ -1,7 +1,7 @@
 error[E0573]: expected type, found variant `Foo::Bar`
   --> $DIR/enum-variant-type-2.rs:7:11
    |
-LL | fn foo(x: Foo::Bar) {} //~ ERROR expected type, found variant `Foo::Bar`
+LL | fn foo(x: Foo::Bar) {}
    |           ^^^^^^^^
    |           |
    |           not a type