summary refs log tree commit diff
path: root/src/test/ui/error-codes
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-03-09 15:03:44 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-03-11 23:10:26 +0300
commitfa72a81bea27f1fda4287475e4cc2f684c971e7f (patch)
treee691a2e38d57c5cd37932754ddf1d8a7048f1f54 /src/test/ui/error-codes
parent2060d49c39e41a286b0425cb2f7ba6022a2d4b96 (diff)
downloadrust-fa72a81bea27f1fda4287475e4cc2f684c971e7f.tar.gz
rust-fa72a81bea27f1fda4287475e4cc2f684c971e7f.zip
Update tests
Diffstat (limited to 'src/test/ui/error-codes')
-rw-r--r--src/test/ui/error-codes/E0001.stderr2
-rw-r--r--src/test/ui/error-codes/E0004-2.stderr2
-rw-r--r--src/test/ui/error-codes/E0004.stderr2
-rw-r--r--src/test/ui/error-codes/E0005.stderr2
-rw-r--r--src/test/ui/error-codes/E0010-teach.stderr4
-rw-r--r--src/test/ui/error-codes/E0010.stderr4
-rw-r--r--src/test/ui/error-codes/E0017.stderr10
-rw-r--r--src/test/ui/error-codes/E0023.stderr6
-rw-r--r--src/test/ui/error-codes/E0034.stderr2
-rw-r--r--src/test/ui/error-codes/E0045.stderr2
-rw-r--r--src/test/ui/error-codes/E0049.stderr2
-rw-r--r--src/test/ui/error-codes/E0050.stderr6
-rw-r--r--src/test/ui/error-codes/E0054.stderr2
-rw-r--r--src/test/ui/error-codes/E0057.stderr4
-rw-r--r--src/test/ui/error-codes/E0059.stderr2
-rw-r--r--src/test/ui/error-codes/E0067.stderr4
-rw-r--r--src/test/ui/error-codes/E0070.stderr8
-rw-r--r--src/test/ui/error-codes/E0075.stderr2
-rw-r--r--src/test/ui/error-codes/E0077.stderr2
-rw-r--r--src/test/ui/error-codes/E0080.stderr4
-rw-r--r--src/test/ui/error-codes/E0084.stderr2
-rw-r--r--src/test/ui/error-codes/E0091.stderr4
-rw-r--r--src/test/ui/error-codes/E0092.stderr2
-rw-r--r--src/test/ui/error-codes/E0094.stderr2
-rw-r--r--src/test/ui/error-codes/E0109.stderr2
-rw-r--r--src/test/ui/error-codes/E0110.stderr2
-rw-r--r--src/test/ui/error-codes/E0117.stderr4
-rw-r--r--src/test/ui/error-codes/E0118.stderr2
-rw-r--r--src/test/ui/error-codes/E0119.stderr2
-rw-r--r--src/test/ui/error-codes/E0121.stderr4
-rw-r--r--src/test/ui/error-codes/E0128.stderr2
-rw-r--r--src/test/ui/error-codes/E0132.stderr2
-rw-r--r--src/test/ui/error-codes/E0152.stderr2
-rw-r--r--src/test/ui/error-codes/E0164.stderr2
-rw-r--r--src/test/ui/error-codes/E0184.stderr2
-rw-r--r--src/test/ui/error-codes/E0186.stderr4
-rw-r--r--src/test/ui/error-codes/E0191.stderr2
-rw-r--r--src/test/ui/error-codes/E0192.stderr2
-rw-r--r--src/test/ui/error-codes/E0195.stderr2
-rw-r--r--src/test/ui/error-codes/E0197.stderr2
-rw-r--r--src/test/ui/error-codes/E0198.stderr2
-rw-r--r--src/test/ui/error-codes/E0199.stderr2
-rw-r--r--src/test/ui/error-codes/E0200.stderr2
-rw-r--r--src/test/ui/error-codes/E0201.stderr6
-rw-r--r--src/test/ui/error-codes/E0207.stderr2
-rw-r--r--src/test/ui/error-codes/E0220.stderr4
-rw-r--r--src/test/ui/error-codes/E0252.stderr4
-rw-r--r--src/test/ui/error-codes/E0255.stderr2
-rw-r--r--src/test/ui/error-codes/E0261.stderr4
-rw-r--r--src/test/ui/error-codes/E0262.stderr2
-rw-r--r--src/test/ui/error-codes/E0264.stderr2
-rw-r--r--src/test/ui/error-codes/E0267.stderr2
-rw-r--r--src/test/ui/error-codes/E0268.stderr2
-rw-r--r--src/test/ui/error-codes/E0271.stderr2
-rw-r--r--src/test/ui/error-codes/E0275.stderr2
-rw-r--r--src/test/ui/error-codes/E0276.stderr2
-rw-r--r--src/test/ui/error-codes/E0282.stderr2
-rw-r--r--src/test/ui/error-codes/E0283.stderr2
-rw-r--r--src/test/ui/error-codes/E0301.stderr2
-rw-r--r--src/test/ui/error-codes/E0302.stderr2
-rw-r--r--src/test/ui/error-codes/E0308-4.stderr2
-rw-r--r--src/test/ui/error-codes/E0308.stderr2
-rw-r--r--src/test/ui/error-codes/E0370.stderr2
-rw-r--r--src/test/ui/error-codes/E0374.stderr2
-rw-r--r--src/test/ui/error-codes/E0376.stderr2
-rw-r--r--src/test/ui/error-codes/E0388.stderr10
-rw-r--r--src/test/ui/error-codes/E0389.stderr2
-rw-r--r--src/test/ui/error-codes/E0390.stderr4
-rw-r--r--src/test/ui/error-codes/E0392.stderr2
-rw-r--r--src/test/ui/error-codes/E0395.stderr2
-rw-r--r--src/test/ui/error-codes/E0401.stderr6
-rw-r--r--src/test/ui/error-codes/E0403.stderr2
-rw-r--r--src/test/ui/error-codes/E0404.stderr4
-rw-r--r--src/test/ui/error-codes/E0405.stderr2
-rw-r--r--src/test/ui/error-codes/E0408.stderr2
-rw-r--r--src/test/ui/error-codes/E0411.stderr2
-rw-r--r--src/test/ui/error-codes/E0412.stderr2
-rw-r--r--src/test/ui/error-codes/E0415.stderr2
-rw-r--r--src/test/ui/error-codes/E0416.stderr2
-rw-r--r--src/test/ui/error-codes/E0423.stderr2
-rw-r--r--src/test/ui/error-codes/E0424.stderr4
-rw-r--r--src/test/ui/error-codes/E0425.stderr2
-rw-r--r--src/test/ui/error-codes/E0428.stderr4
-rw-r--r--src/test/ui/error-codes/E0429.stderr2
-rw-r--r--src/test/ui/error-codes/E0430.stderr4
-rw-r--r--src/test/ui/error-codes/E0431.stderr2
-rw-r--r--src/test/ui/error-codes/E0432.stderr2
-rw-r--r--src/test/ui/error-codes/E0433.stderr2
-rw-r--r--src/test/ui/error-codes/E0434.stderr2
-rw-r--r--src/test/ui/error-codes/E0435.stderr2
-rw-r--r--src/test/ui/error-codes/E0437.stderr2
-rw-r--r--src/test/ui/error-codes/E0438.stderr2
-rw-r--r--src/test/ui/error-codes/E0439.stderr2
-rw-r--r--src/test/ui/error-codes/E0446.stderr2
-rw-r--r--src/test/ui/error-codes/E0449.stderr6
-rw-r--r--src/test/ui/error-codes/E0451.stderr4
-rw-r--r--src/test/ui/error-codes/E0452.stderr2
-rw-r--r--src/test/ui/error-codes/E0458.stderr4
-rw-r--r--src/test/ui/error-codes/E0459.stderr2
-rw-r--r--src/test/ui/error-codes/E0478.stderr2
-rw-r--r--src/test/ui/error-codes/E0492.stderr2
-rw-r--r--src/test/ui/error-codes/E0496.stderr2
-rw-r--r--src/test/ui/error-codes/E0499.stderr2
-rw-r--r--src/test/ui/error-codes/E0502.stderr2
-rw-r--r--src/test/ui/error-codes/E0503.stderr2
-rw-r--r--src/test/ui/error-codes/E0504.stderr2
-rw-r--r--src/test/ui/error-codes/E0505.stderr2
-rw-r--r--src/test/ui/error-codes/E0507.stderr2
-rw-r--r--src/test/ui/error-codes/E0509.stderr2
-rw-r--r--src/test/ui/error-codes/E0511.stderr2
-rw-r--r--src/test/ui/error-codes/E0512.stderr2
-rw-r--r--src/test/ui/error-codes/E0516.stderr2
-rw-r--r--src/test/ui/error-codes/E0517.stderr8
-rw-r--r--src/test/ui/error-codes/E0518.stderr4
-rw-r--r--src/test/ui/error-codes/E0530.stderr2
-rw-r--r--src/test/ui/error-codes/E0534.stderr2
-rw-r--r--src/test/ui/error-codes/E0565-1.stderr2
-rw-r--r--src/test/ui/error-codes/E0565-2.stderr2
-rw-r--r--src/test/ui/error-codes/E0565.stderr2
-rw-r--r--src/test/ui/error-codes/E0572.stderr2
-rw-r--r--src/test/ui/error-codes/E0586.stderr2
-rw-r--r--src/test/ui/error-codes/E0597.stderr2
-rw-r--r--src/test/ui/error-codes/E0599.stderr2
-rw-r--r--src/test/ui/error-codes/E0600.stderr2
-rw-r--r--src/test/ui/error-codes/E0603.stderr2
-rw-r--r--src/test/ui/error-codes/E0604.stderr2
-rw-r--r--src/test/ui/error-codes/E0605.stderr4
-rw-r--r--src/test/ui/error-codes/E0606.stderr2
-rw-r--r--src/test/ui/error-codes/E0607.stderr2
-rw-r--r--src/test/ui/error-codes/E0608.stderr2
-rw-r--r--src/test/ui/error-codes/E0609.stderr4
-rw-r--r--src/test/ui/error-codes/E0610.stderr2
-rw-r--r--src/test/ui/error-codes/E0614.stderr2
-rw-r--r--src/test/ui/error-codes/E0615.stderr2
-rw-r--r--src/test/ui/error-codes/E0616.stderr2
-rw-r--r--src/test/ui/error-codes/E0620.stderr4
-rw-r--r--src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr10
-rw-r--r--src/test/ui/error-codes/E0624.stderr2
-rw-r--r--src/test/ui/error-codes/E0637.stderr6
-rw-r--r--src/test/ui/error-codes/E0646.stderr2
-rw-r--r--src/test/ui/error-codes/E0647.stderr2
-rw-r--r--src/test/ui/error-codes/E0648.stderr2
-rw-r--r--src/test/ui/error-codes/E0658.stderr2
-rw-r--r--src/test/ui/error-codes/E0659.stderr2
-rw-r--r--src/test/ui/error-codes/E0718.stderr2
-rw-r--r--src/test/ui/error-codes/ex-E0611.stderr2
-rw-r--r--src/test/ui/error-codes/ex-E0612.stderr2
147 files changed, 200 insertions, 200 deletions
diff --git a/src/test/ui/error-codes/E0001.stderr b/src/test/ui/error-codes/E0001.stderr
index 0b884c54a82..99234515182 100644
--- a/src/test/ui/error-codes/E0001.stderr
+++ b/src/test/ui/error-codes/E0001.stderr
@@ -1,7 +1,7 @@
 error: unreachable pattern
   --> $DIR/E0001.rs:8:9
    |
-LL |         _ => {/* ... */} //~ ERROR unreachable pattern
+LL |         _ => {/* ... */}
    |         ^
    |
 note: lint level defined here
diff --git a/src/test/ui/error-codes/E0004-2.stderr b/src/test/ui/error-codes/E0004-2.stderr
index c8732852a71..db0a2b5a085 100644
--- a/src/test/ui/error-codes/E0004-2.stderr
+++ b/src/test/ui/error-codes/E0004-2.stderr
@@ -1,7 +1,7 @@
 error[E0004]: non-exhaustive patterns: multiple patterns of type `std::option::Option<i32>` are not handled
   --> $DIR/E0004-2.rs:4:11
    |
-LL |     match x { } //~ ERROR E0004
+LL |     match x { }
    |           ^
    |
    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
diff --git a/src/test/ui/error-codes/E0004.stderr b/src/test/ui/error-codes/E0004.stderr
index 123f4b2f1b7..2940ad4bb1e 100644
--- a/src/test/ui/error-codes/E0004.stderr
+++ b/src/test/ui/error-codes/E0004.stderr
@@ -8,7 +8,7 @@ LL | |     TalkToMyHand,
 LL | | }
    | |_- `Terminator` defined here
 ...
-LL |       match x { //~ ERROR E0004
+LL |       match x {
    |             ^ pattern `HastaLaVistaBaby` not covered
    |
    = help: ensure that all possible cases are being handled, possibly by adding wildcards or more match arms
diff --git a/src/test/ui/error-codes/E0005.stderr b/src/test/ui/error-codes/E0005.stderr
index 2a38aae0873..56a4bcffc81 100644
--- a/src/test/ui/error-codes/E0005.stderr
+++ b/src/test/ui/error-codes/E0005.stderr
@@ -1,7 +1,7 @@
 error[E0005]: refutable pattern in local binding: `None` not covered
   --> $DIR/E0005.rs:3:9
    |
-LL |     let Some(y) = x; //~ ERROR E0005
+LL |     let Some(y) = x;
    |         ^^^^^^^ pattern `None` not covered
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0010-teach.stderr b/src/test/ui/error-codes/E0010-teach.stderr
index 77e7b5ec0e8..3e8467fad6f 100644
--- a/src/test/ui/error-codes/E0010-teach.stderr
+++ b/src/test/ui/error-codes/E0010-teach.stderr
@@ -1,7 +1,7 @@
 error[E0010]: allocations are not allowed in constants
   --> $DIR/E0010-teach.rs:6:24
    |
-LL | const CON : Box<i32> = box 0; //~ ERROR E0010
+LL | const CON : Box<i32> = box 0;
    |                        ^^^^^ allocation not allowed in constants
    |
    = note: The value of statics and constants must be known at compile time, and they live for the entire lifetime of a program. Creating a boxed value allocates memory on the heap at runtime, and therefore cannot be done at compile time.
@@ -9,7 +9,7 @@ LL | const CON : Box<i32> = box 0; //~ ERROR E0010
 error[E0019]: constant contains unimplemented expression type
   --> $DIR/E0010-teach.rs:6:28
    |
-LL | const CON : Box<i32> = box 0; //~ ERROR E0010
+LL | const CON : Box<i32> = box 0;
    |                            ^
    |
    = note: A function call isn't allowed in the const's initialization expression because the expression's value must be known at compile-time.
diff --git a/src/test/ui/error-codes/E0010.stderr b/src/test/ui/error-codes/E0010.stderr
index 1364693109e..285570f755e 100644
--- a/src/test/ui/error-codes/E0010.stderr
+++ b/src/test/ui/error-codes/E0010.stderr
@@ -1,13 +1,13 @@
 error[E0010]: allocations are not allowed in constants
   --> $DIR/E0010.rs:4:24
    |
-LL | const CON : Box<i32> = box 0; //~ ERROR E0010
+LL | const CON : Box<i32> = box 0;
    |                        ^^^^^ allocation not allowed in constants
 
 error[E0019]: constant contains unimplemented expression type
   --> $DIR/E0010.rs:4:28
    |
-LL | const CON : Box<i32> = box 0; //~ ERROR E0010
+LL | const CON : Box<i32> = box 0;
    |                            ^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0017.stderr b/src/test/ui/error-codes/E0017.stderr
index cc202ec912e..d0bd93eb908 100644
--- a/src/test/ui/error-codes/E0017.stderr
+++ b/src/test/ui/error-codes/E0017.stderr
@@ -1,31 +1,31 @@
 error[E0017]: references in constants may only refer to immutable values
   --> $DIR/E0017.rs:4:30
    |
-LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017
+LL | const CR: &'static mut i32 = &mut C;
    |                              ^^^^^^ constants require immutable values
 
 error[E0017]: references in statics may only refer to immutable values
   --> $DIR/E0017.rs:5:39
    |
-LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
+LL | static STATIC_REF: &'static mut i32 = &mut X;
    |                                       ^^^^^^ statics require immutable values
 
 error: cannot mutate statics in the initializer of another static
   --> $DIR/E0017.rs:5:39
    |
-LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
+LL | static STATIC_REF: &'static mut i32 = &mut X;
    |                                       ^^^^^^
 
 error[E0596]: cannot borrow immutable static item as mutable
   --> $DIR/E0017.rs:5:44
    |
-LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
+LL | static STATIC_REF: &'static mut i32 = &mut X;
    |                                            ^
 
 error[E0017]: references in statics may only refer to immutable values
   --> $DIR/E0017.rs:8:38
    |
-LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
+LL | static CONST_REF: &'static mut i32 = &mut C;
    |                                      ^^^^^^ statics require immutable values
 
 error: aborting due to 5 previous errors
diff --git a/src/test/ui/error-codes/E0023.stderr b/src/test/ui/error-codes/E0023.stderr
index 37704fc3233..1bc90a995fe 100644
--- a/src/test/ui/error-codes/E0023.stderr
+++ b/src/test/ui/error-codes/E0023.stderr
@@ -1,19 +1,19 @@
 error[E0023]: this pattern has 1 field, but the corresponding tuple variant has 2 fields
   --> $DIR/E0023.rs:10:9
    |
-LL |         Fruit::Apple(a) => {}, //~ ERROR E0023
+LL |         Fruit::Apple(a) => {},
    |         ^^^^^^^^^^^^^^^ expected 2 fields, found 1
 
 error[E0023]: this pattern has 3 fields, but the corresponding tuple variant has 2 fields
   --> $DIR/E0023.rs:11:9
    |
-LL |         Fruit::Apple(a, b, c) => {}, //~ ERROR E0023
+LL |         Fruit::Apple(a, b, c) => {},
    |         ^^^^^^^^^^^^^^^^^^^^^ expected 2 fields, found 3
 
 error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has 1 field
   --> $DIR/E0023.rs:12:9
    |
-LL |         Fruit::Pear(1, 2) => {}, //~ ERROR E0023
+LL |         Fruit::Pear(1, 2) => {},
    |         ^^^^^^^^^^^^^^^^^ expected 1 field, found 2
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/error-codes/E0034.stderr b/src/test/ui/error-codes/E0034.stderr
index 3c5569eb79f..816a48f102d 100644
--- a/src/test/ui/error-codes/E0034.stderr
+++ b/src/test/ui/error-codes/E0034.stderr
@@ -1,7 +1,7 @@
 error[E0034]: multiple applicable items in scope
   --> $DIR/E0034.rs:20:5
    |
-LL |     Test::foo() //~ ERROR multiple applicable items in scope
+LL |     Test::foo()
    |     ^^^^^^^^^ multiple `foo` found
    |
 note: candidate #1 is defined in an impl of the trait `Trait1` for the type `Test`
diff --git a/src/test/ui/error-codes/E0045.stderr b/src/test/ui/error-codes/E0045.stderr
index 0ce91f0a401..d163128bc8b 100644
--- a/src/test/ui/error-codes/E0045.stderr
+++ b/src/test/ui/error-codes/E0045.stderr
@@ -1,7 +1,7 @@
 error[E0045]: C-variadic function must have C or cdecl calling convention
   --> $DIR/E0045.rs:1:17
    |
-LL | extern "Rust" { fn foo(x: u8, ...); }   //~ ERROR E0045
+LL | extern "Rust" { fn foo(x: u8, ...); }
    |                 ^^^^^^^^^^^^^^^^^^^ C-variadics require C or cdecl calling convention
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0049.stderr b/src/test/ui/error-codes/E0049.stderr
index 0d132bdbbdd..7e9b9e8efb9 100644
--- a/src/test/ui/error-codes/E0049.stderr
+++ b/src/test/ui/error-codes/E0049.stderr
@@ -4,7 +4,7 @@ error[E0049]: method `foo` has 0 type parameters but its trait declaration has 1
 LL |     fn foo<T: Default>(x: T) -> Self;
    |     --------------------------------- expected 1 type parameter
 ...
-LL |     fn foo(x: bool) -> Self { Bar } //~ ERROR E0049
+LL |     fn foo(x: bool) -> Self { Bar }
    |     ^^^^^^^^^^^^^^^^^^^^^^^ found 0 type parameters
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0050.stderr b/src/test/ui/error-codes/E0050.stderr
index 2c1fd111d26..fe9ac5e8eb0 100644
--- a/src/test/ui/error-codes/E0050.stderr
+++ b/src/test/ui/error-codes/E0050.stderr
@@ -4,7 +4,7 @@ error[E0050]: method `foo` has 1 parameter but the declaration in trait `Foo::fo
 LL |     fn foo(&self, x: u8) -> bool;
    |            ------------ trait requires 2 parameters
 ...
-LL |     fn foo(&self) -> bool { true } //~ ERROR E0050
+LL |     fn foo(&self) -> bool { true }
    |            ^^^^^ expected 2 parameters, found 1
 
 error[E0050]: method `bar` has 1 parameter but the declaration in trait `Foo::bar` has 4
@@ -13,7 +13,7 @@ error[E0050]: method `bar` has 1 parameter but the declaration in trait `Foo::ba
 LL |     fn bar(&self, x: u8, y: u8, z: u8);
    |            -------------------------- trait requires 4 parameters
 ...
-LL |     fn bar(&self) { } //~ ERROR E0050
+LL |     fn bar(&self) { }
    |            ^^^^^ expected 4 parameters, found 1
 
 error[E0050]: method `less` has 4 parameters but the declaration in trait `Foo::less` has 1
@@ -22,7 +22,7 @@ error[E0050]: method `less` has 4 parameters but the declaration in trait `Foo::
 LL |     fn less(&self);
    |             ----- trait requires 1 parameter
 ...
-LL |     fn less(&self, x: u8, y: u8, z: u8) { } //~ ERROR E0050
+LL |     fn less(&self, x: u8, y: u8, z: u8) { }
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected 1 parameter, found 4
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/error-codes/E0054.stderr b/src/test/ui/error-codes/E0054.stderr
index cce32fa2944..6b1092760fb 100644
--- a/src/test/ui/error-codes/E0054.stderr
+++ b/src/test/ui/error-codes/E0054.stderr
@@ -1,7 +1,7 @@
 error[E0054]: cannot cast as `bool`
   --> $DIR/E0054.rs:3:24
    |
-LL |     let x_is_nonzero = x as bool; //~ ERROR E0054
+LL |     let x_is_nonzero = x as bool;
    |                        ^^^^^^^^^ help: compare with zero instead: `x != 0`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0057.stderr b/src/test/ui/error-codes/E0057.stderr
index 5906a05c32c..6b5890cac36 100644
--- a/src/test/ui/error-codes/E0057.stderr
+++ b/src/test/ui/error-codes/E0057.stderr
@@ -1,13 +1,13 @@
 error[E0057]: this function takes 1 parameter but 0 parameters were supplied
   --> $DIR/E0057.rs:3:13
    |
-LL |     let a = f(); //~ ERROR E0057
+LL |     let a = f();
    |             ^^^ expected 1 parameter
 
 error[E0057]: this function takes 1 parameter but 2 parameters were supplied
   --> $DIR/E0057.rs:5:13
    |
-LL |     let c = f(2, 3); //~ ERROR E0057
+LL |     let c = f(2, 3);
    |             ^^^^^^^ expected 1 parameter
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0059.stderr b/src/test/ui/error-codes/E0059.stderr
index a96e1a0beab..a1b8aeaedbb 100644
--- a/src/test/ui/error-codes/E0059.stderr
+++ b/src/test/ui/error-codes/E0059.stderr
@@ -1,7 +1,7 @@
 error[E0059]: cannot use call notation; the first type parameter for the function trait is neither a tuple nor unit
   --> $DIR/E0059.rs:3:41
    |
-LL | fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) } //~ ERROR E0059
+LL | fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) }
    |                                         ^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0067.stderr b/src/test/ui/error-codes/E0067.stderr
index fd4ca7c9f70..024c8681b55 100644
--- a/src/test/ui/error-codes/E0067.stderr
+++ b/src/test/ui/error-codes/E0067.stderr
@@ -1,7 +1,7 @@
 error[E0368]: binary assignment operation `+=` cannot be applied to type `std::collections::LinkedList<_>`
   --> $DIR/E0067.rs:4:5
    |
-LL |     LinkedList::new() += 1; //~ ERROR E0368
+LL |     LinkedList::new() += 1;
    |     -----------------^^^^^
    |     |
    |     cannot use `+=` on type `std::collections::LinkedList<_>`
@@ -11,7 +11,7 @@ LL |     LinkedList::new() += 1; //~ ERROR E0368
 error[E0067]: invalid left-hand side expression
   --> $DIR/E0067.rs:4:5
    |
-LL |     LinkedList::new() += 1; //~ ERROR E0368
+LL |     LinkedList::new() += 1;
    |     ^^^^^^^^^^^^^^^^^ invalid expression for left-hand side
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0070.stderr b/src/test/ui/error-codes/E0070.stderr
index 4c1cfd858e6..6592ad328be 100644
--- a/src/test/ui/error-codes/E0070.stderr
+++ b/src/test/ui/error-codes/E0070.stderr
@@ -1,19 +1,19 @@
 error[E0070]: invalid left-hand side expression
   --> $DIR/E0070.rs:6:5
    |
-LL |     SOME_CONST = 14; //~ ERROR E0070
+LL |     SOME_CONST = 14;
    |     ^^^^^^^^^^^^^^^ left-hand of expression not valid
 
 error[E0070]: invalid left-hand side expression
   --> $DIR/E0070.rs:7:5
    |
-LL |     1 = 3; //~ ERROR E0070
+LL |     1 = 3;
    |     ^^^^^ left-hand of expression not valid
 
 error[E0308]: mismatched types
   --> $DIR/E0070.rs:8:25
    |
-LL |     some_other_func() = 4; //~ ERROR E0070
+LL |     some_other_func() = 4;
    |                         ^ expected (), found integer
    |
    = note: expected type `()`
@@ -22,7 +22,7 @@ LL |     some_other_func() = 4; //~ ERROR E0070
 error[E0070]: invalid left-hand side expression
   --> $DIR/E0070.rs:8:5
    |
-LL |     some_other_func() = 4; //~ ERROR E0070
+LL |     some_other_func() = 4;
    |     ^^^^^^^^^^^^^^^^^^^^^ left-hand of expression not valid
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/error-codes/E0075.stderr b/src/test/ui/error-codes/E0075.stderr
index abf68897096..d8b90d0691d 100644
--- a/src/test/ui/error-codes/E0075.stderr
+++ b/src/test/ui/error-codes/E0075.stderr
@@ -1,7 +1,7 @@
 error[E0075]: SIMD vector cannot be empty
   --> $DIR/E0075.rs:4:1
    |
-LL | struct Bad; //~ ERROR E0075
+LL | struct Bad;
    | ^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0077.stderr b/src/test/ui/error-codes/E0077.stderr
index 9f3e1fa5c35..4f85d175ce6 100644
--- a/src/test/ui/error-codes/E0077.stderr
+++ b/src/test/ui/error-codes/E0077.stderr
@@ -1,7 +1,7 @@
 error[E0077]: SIMD vector element type should be machine type
   --> $DIR/E0077.rs:4:1
    |
-LL | struct Bad(String); //~ ERROR E0077
+LL | struct Bad(String);
    | ^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0080.stderr b/src/test/ui/error-codes/E0080.stderr
index 4d37881c1e1..3113fd2189b 100644
--- a/src/test/ui/error-codes/E0080.stderr
+++ b/src/test/ui/error-codes/E0080.stderr
@@ -1,13 +1,13 @@
 error[E0080]: evaluation of constant value failed
   --> $DIR/E0080.rs:2:9
    |
-LL |     X = (1 << 500), //~ ERROR E0080
+LL |     X = (1 << 500),
    |         ^^^^^^^^^^ attempt to shift left with overflow
 
 error[E0080]: evaluation of constant value failed
   --> $DIR/E0080.rs:4:9
    |
-LL |     Y = (1 / 0) //~ ERROR E0080
+LL |     Y = (1 / 0)
    |         ^^^^^^^ attempt to divide by zero
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0084.stderr b/src/test/ui/error-codes/E0084.stderr
index 353c825f528..1f818da25bb 100644
--- a/src/test/ui/error-codes/E0084.stderr
+++ b/src/test/ui/error-codes/E0084.stderr
@@ -1,7 +1,7 @@
 error[E0084]: unsupported representation for zero-variant enum
   --> $DIR/E0084.rs:1:1
    |
-LL | #[repr(i32)] //~ ERROR: E0084
+LL | #[repr(i32)]
    | ^^^^^^^^^^^^
 LL | enum Foo {}
    | ----------- zero-variant enum
diff --git a/src/test/ui/error-codes/E0091.stderr b/src/test/ui/error-codes/E0091.stderr
index d32960f82cb..a596b75e481 100644
--- a/src/test/ui/error-codes/E0091.stderr
+++ b/src/test/ui/error-codes/E0091.stderr
@@ -1,13 +1,13 @@
 error[E0091]: type parameter `T` is unused
   --> $DIR/E0091.rs:1:10
    |
-LL | type Foo<T> = u32; //~ ERROR E0091
+LL | type Foo<T> = u32;
    |          ^ unused type parameter
 
 error[E0091]: type parameter `B` is unused
   --> $DIR/E0091.rs:2:14
    |
-LL | type Foo2<A, B> = Box<A>; //~ ERROR E0091
+LL | type Foo2<A, B> = Box<A>;
    |              ^ unused type parameter
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0092.stderr b/src/test/ui/error-codes/E0092.stderr
index a4535177526..2d590a8e1d7 100644
--- a/src/test/ui/error-codes/E0092.stderr
+++ b/src/test/ui/error-codes/E0092.stderr
@@ -1,7 +1,7 @@
 error[E0092]: unrecognized atomic operation function: `foo`
   --> $DIR/E0092.rs:3:5
    |
-LL |     fn atomic_foo(); //~ ERROR E0092
+LL |     fn atomic_foo();
    |     ^^^^^^^^^^^^^^^^ unrecognized atomic operation
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0094.stderr b/src/test/ui/error-codes/E0094.stderr
index 97bdbfbe5ab..da97f3a014b 100644
--- a/src/test/ui/error-codes/E0094.stderr
+++ b/src/test/ui/error-codes/E0094.stderr
@@ -1,7 +1,7 @@
 error[E0094]: intrinsic has wrong number of type parameters: found 2, expected 1
   --> $DIR/E0094.rs:3:15
    |
-LL |     fn size_of<T, U>() -> usize; //~ ERROR E0094
+LL |     fn size_of<T, U>() -> usize;
    |               ^^^^^^ expected 1 type parameter
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0109.stderr b/src/test/ui/error-codes/E0109.stderr
index a5508f98085..a807f2d44a6 100644
--- a/src/test/ui/error-codes/E0109.stderr
+++ b/src/test/ui/error-codes/E0109.stderr
@@ -1,7 +1,7 @@
 error[E0109]: type arguments are not allowed on this entity
   --> $DIR/E0109.rs:1:14
    |
-LL | type X = u32<i32>; //~ ERROR E0109
+LL | type X = u32<i32>;
    |              ^^^ type argument not allowed
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0110.stderr b/src/test/ui/error-codes/E0110.stderr
index a644ac92cef..3bc4775bdc1 100644
--- a/src/test/ui/error-codes/E0110.stderr
+++ b/src/test/ui/error-codes/E0110.stderr
@@ -1,7 +1,7 @@
 error[E0110]: lifetime arguments are not allowed on this entity
   --> $DIR/E0110.rs:1:14
    |
-LL | type X = u32<'static>; //~ ERROR E0110
+LL | type X = u32<'static>;
    |              ^^^^^^^ lifetime argument not allowed
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0117.stderr b/src/test/ui/error-codes/E0117.stderr
index b007ca05ab2..80b3a4e714a 100644
--- a/src/test/ui/error-codes/E0117.stderr
+++ b/src/test/ui/error-codes/E0117.stderr
@@ -1,13 +1,13 @@
 error[E0120]: the Drop trait may only be implemented on structures
   --> $DIR/E0117.rs:1:15
    |
-LL | impl Drop for u32 {} //~ ERROR E0117
+LL | impl Drop for u32 {}
    |               ^^^ implementing Drop requires a struct
 
 error[E0117]: only traits defined in the current crate can be implemented for arbitrary types
   --> $DIR/E0117.rs:1:1
    |
-LL | impl Drop for u32 {} //~ ERROR E0117
+LL | impl Drop for u32 {}
    | ^^^^^^^^^^^^^^^^^ impl doesn't use types inside crate
    |
    = note: the impl does not reference only types defined in this crate
diff --git a/src/test/ui/error-codes/E0118.stderr b/src/test/ui/error-codes/E0118.stderr
index 787f8caec7f..b0afaeb5c1f 100644
--- a/src/test/ui/error-codes/E0118.stderr
+++ b/src/test/ui/error-codes/E0118.stderr
@@ -1,7 +1,7 @@
 error[E0118]: no base type found for inherent implementation
   --> $DIR/E0118.rs:1:6
    |
-LL | impl (u8, u8) { //~ ERROR E0118
+LL | impl (u8, u8) {
    |      ^^^^^^^^ impl requires a base type
    |
    = note: either implement a trait on it or create a newtype to wrap it instead
diff --git a/src/test/ui/error-codes/E0119.stderr b/src/test/ui/error-codes/E0119.stderr
index af9acb294bc..e7690aa30bd 100644
--- a/src/test/ui/error-codes/E0119.stderr
+++ b/src/test/ui/error-codes/E0119.stderr
@@ -4,7 +4,7 @@ error[E0119]: conflicting implementations of trait `MyTrait` for type `Foo`:
 LL | impl<T> MyTrait for T {
    | --------------------- first implementation here
 ...
-LL | impl MyTrait for Foo { //~ ERROR E0119
+LL | impl MyTrait for Foo {
    | ^^^^^^^^^^^^^^^^^^^^ conflicting implementation for `Foo`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0121.stderr b/src/test/ui/error-codes/E0121.stderr
index 75e03c659b7..b7f4ce4d230 100644
--- a/src/test/ui/error-codes/E0121.stderr
+++ b/src/test/ui/error-codes/E0121.stderr
@@ -1,13 +1,13 @@
 error[E0121]: the type placeholder `_` is not allowed within types on item signatures
   --> $DIR/E0121.rs:1:13
    |
-LL | fn foo() -> _ { 5 } //~ ERROR E0121
+LL | fn foo() -> _ { 5 }
    |             ^ not allowed in type signatures
 
 error[E0121]: the type placeholder `_` is not allowed within types on item signatures
   --> $DIR/E0121.rs:3:13
    |
-LL | static BAR: _ = "test"; //~ ERROR E0121
+LL | static BAR: _ = "test";
    |             ^ not allowed in type signatures
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0128.stderr b/src/test/ui/error-codes/E0128.stderr
index 9ea3c09e63f..253aa166bd3 100644
--- a/src/test/ui/error-codes/E0128.stderr
+++ b/src/test/ui/error-codes/E0128.stderr
@@ -1,7 +1,7 @@
 error[E0128]: type parameters with a default cannot use forward declared identifiers
   --> $DIR/E0128.rs:1:14
    |
-LL | struct Foo<T=U, U=()> { //~ ERROR E0128
+LL | struct Foo<T=U, U=()> {
    |              ^ defaulted type parameters cannot be forward declared
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0132.stderr b/src/test/ui/error-codes/E0132.stderr
index e19b421bfdb..c21363756b3 100644
--- a/src/test/ui/error-codes/E0132.stderr
+++ b/src/test/ui/error-codes/E0132.stderr
@@ -1,7 +1,7 @@
 error[E0132]: start function is not allowed to have type parameters
   --> $DIR/E0132.rs:4:5
    |
-LL | fn f< T >() {} //~ ERROR E0132
+LL | fn f< T >() {}
    |     ^^^^^ start function cannot have type parameters
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0152.stderr b/src/test/ui/error-codes/E0152.stderr
index 401c1755fa8..26e6e2e1bce 100644
--- a/src/test/ui/error-codes/E0152.stderr
+++ b/src/test/ui/error-codes/E0152.stderr
@@ -1,7 +1,7 @@
 error[E0152]: duplicate lang item found: `arc`.
   --> $DIR/E0152.rs:4:1
    |
-LL | struct Foo; //~ ERROR E0152
+LL | struct Foo;
    | ^^^^^^^^^^^
    |
    = note: first defined in crate `alloc`.
diff --git a/src/test/ui/error-codes/E0164.stderr b/src/test/ui/error-codes/E0164.stderr
index 0debc8092e8..0a153d85b42 100644
--- a/src/test/ui/error-codes/E0164.stderr
+++ b/src/test/ui/error-codes/E0164.stderr
@@ -1,7 +1,7 @@
 error[E0164]: expected tuple struct/variant, found associated constant `<Foo>::B`
   --> $DIR/E0164.rs:9:9
    |
-LL |         Foo::B(i) => i, //~ ERROR E0164
+LL |         Foo::B(i) => i,
    |         ^^^^^^^^^ not a tuple variant or struct
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0184.stderr b/src/test/ui/error-codes/E0184.stderr
index 471ba3870e2..b4128b95606 100644
--- a/src/test/ui/error-codes/E0184.stderr
+++ b/src/test/ui/error-codes/E0184.stderr
@@ -1,7 +1,7 @@
 error[E0184]: the trait `Copy` may not be implemented for this type; the type has a destructor
   --> $DIR/E0184.rs:1:10
    |
-LL | #[derive(Copy)] //~ ERROR E0184
+LL | #[derive(Copy)]
    |          ^^^^ Copy not allowed on types with destructors
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0186.stderr b/src/test/ui/error-codes/E0186.stderr
index 7fed0426ee8..8971d61fc75 100644
--- a/src/test/ui/error-codes/E0186.stderr
+++ b/src/test/ui/error-codes/E0186.stderr
@@ -1,10 +1,10 @@
 error[E0186]: method `foo` has a `&self` declaration in the trait, but not in the impl
   --> $DIR/E0186.rs:8:5
    |
-LL |     fn foo(&self); //~ `&self` used in trait
+LL |     fn foo(&self);
    |     -------------- `&self` used in trait
 ...
-LL |     fn foo() {} //~ ERROR E0186
+LL |     fn foo() {}
    |     ^^^^^^^^ expected `&self` in impl
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0191.stderr b/src/test/ui/error-codes/E0191.stderr
index 570b0ddc313..2d9fdfe5d29 100644
--- a/src/test/ui/error-codes/E0191.stderr
+++ b/src/test/ui/error-codes/E0191.stderr
@@ -4,7 +4,7 @@ error[E0191]: the value of the associated type `Bar` (from the trait `Trait`) mu
 LL |     type Bar;
    |     --------- `Bar` defined here
 ...
-LL | type Foo = Trait; //~ ERROR E0191
+LL | type Foo = Trait;
    |            ^^^^^ associated type `Bar` must be specified
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0192.stderr b/src/test/ui/error-codes/E0192.stderr
index bdfe717afe2..8faa550a509 100644
--- a/src/test/ui/error-codes/E0192.stderr
+++ b/src/test/ui/error-codes/E0192.stderr
@@ -1,7 +1,7 @@
 error[E0192]: negative impls are only allowed for auto traits (e.g., `Send` and `Sync`)
   --> $DIR/E0192.rs:9:1
    |
-LL | impl !Trait for Foo { } //~ ERROR E0192
+LL | impl !Trait for Foo { }
    | ^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0195.stderr b/src/test/ui/error-codes/E0195.stderr
index 57032c6b0c8..6eaa1750ee3 100644
--- a/src/test/ui/error-codes/E0195.stderr
+++ b/src/test/ui/error-codes/E0195.stderr
@@ -4,7 +4,7 @@ error[E0195]: lifetime parameters or bounds on method `bar` do not match the tra
 LL |     fn bar<'a,'b:'a>(x: &'a str, y: &'b str);
    |           ---------- lifetimes in impl do not match this method in trait
 ...
-LL |     fn bar<'a,'b>(x: &'a str, y: &'b str) { //~ ERROR E0195
+LL |     fn bar<'a,'b>(x: &'a str, y: &'b str) {
    |           ^^^^^^^ lifetimes do not match method in trait
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0197.stderr b/src/test/ui/error-codes/E0197.stderr
index f58dcd791da..bb7b6474d3e 100644
--- a/src/test/ui/error-codes/E0197.stderr
+++ b/src/test/ui/error-codes/E0197.stderr
@@ -1,7 +1,7 @@
 error[E0197]: inherent impls cannot be unsafe
   --> $DIR/E0197.rs:3:1
    |
-LL | unsafe impl Foo { } //~ ERROR E0197
+LL | unsafe impl Foo { }
    | ^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0198.stderr b/src/test/ui/error-codes/E0198.stderr
index e182cbd2ec1..0d3706336a9 100644
--- a/src/test/ui/error-codes/E0198.stderr
+++ b/src/test/ui/error-codes/E0198.stderr
@@ -1,7 +1,7 @@
 error[E0198]: negative impls cannot be unsafe
   --> $DIR/E0198.rs:5:1
    |
-LL | unsafe impl !Send for Foo { } //~ ERROR E0198
+LL | unsafe impl !Send for Foo { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0199.stderr b/src/test/ui/error-codes/E0199.stderr
index ba55c4a58e4..3632d26cd32 100644
--- a/src/test/ui/error-codes/E0199.stderr
+++ b/src/test/ui/error-codes/E0199.stderr
@@ -1,7 +1,7 @@
 error[E0199]: implementing the trait `Bar` is not unsafe
   --> $DIR/E0199.rs:6:1
    |
-LL | unsafe impl Bar for Foo { } //~ ERROR implementing the trait `Bar` is not unsafe [E0199]
+LL | unsafe impl Bar for Foo { }
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0200.stderr b/src/test/ui/error-codes/E0200.stderr
index f6a8f32d238..677271aad44 100644
--- a/src/test/ui/error-codes/E0200.stderr
+++ b/src/test/ui/error-codes/E0200.stderr
@@ -1,7 +1,7 @@
 error[E0200]: the trait `Bar` requires an `unsafe impl` declaration
   --> $DIR/E0200.rs:5:1
    |
-LL | impl Bar for Foo { } //~ ERROR E0200
+LL | impl Bar for Foo { }
    | ^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0201.stderr b/src/test/ui/error-codes/E0201.stderr
index 5d2f9f3e362..89cfd402423 100644
--- a/src/test/ui/error-codes/E0201.stderr
+++ b/src/test/ui/error-codes/E0201.stderr
@@ -3,7 +3,7 @@ error[E0201]: duplicate definitions with name `bar`:
    |
 LL |     fn bar(&self) -> bool { self.0 > 5 }
    |     ------------------------------------ previous definition of `bar` here
-LL |     fn bar() {} //~ ERROR E0201
+LL |     fn bar() {}
    |     ^^^^^^^^^^^ duplicate definition
 
 error[E0201]: duplicate definitions with name `baz`:
@@ -11,7 +11,7 @@ error[E0201]: duplicate definitions with name `baz`:
    |
 LL |     fn baz(&self) -> bool { true }
    |     ------------------------------ previous definition of `baz` here
-LL |     fn baz(&self) -> bool { self.0 > 5 } //~ ERROR E0201
+LL |     fn baz(&self) -> bool { self.0 > 5 }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ duplicate definition
 
 error[E0201]: duplicate definitions with name `Quux`:
@@ -20,7 +20,7 @@ error[E0201]: duplicate definitions with name `Quux`:
 LL |     type Quux = u32;
    |     ---------------- previous definition of `Quux` here
 ...
-LL |     type Quux = u32; //~ ERROR E0201
+LL |     type Quux = u32;
    |     ^^^^^^^^^^^^^^^^ duplicate definition
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/error-codes/E0207.stderr b/src/test/ui/error-codes/E0207.stderr
index c82859a9867..5ef51ed8692 100644
--- a/src/test/ui/error-codes/E0207.stderr
+++ b/src/test/ui/error-codes/E0207.stderr
@@ -1,7 +1,7 @@
 error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates
   --> $DIR/E0207.rs:3:6
    |
-LL | impl<T: Default> Foo { //~ ERROR E0207
+LL | impl<T: Default> Foo {
    |      ^ unconstrained type parameter
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0220.stderr b/src/test/ui/error-codes/E0220.stderr
index 0eb812a5ef0..43949833e21 100644
--- a/src/test/ui/error-codes/E0220.stderr
+++ b/src/test/ui/error-codes/E0220.stderr
@@ -1,7 +1,7 @@
 error[E0220]: associated type `F` not found for `Trait`
   --> $DIR/E0220.rs:5:18
    |
-LL | type Foo = Trait<F=i32>; //~ ERROR E0220
+LL | type Foo = Trait<F=i32>;
    |                  ^^^^^ associated type `F` not found
 
 error[E0191]: the value of the associated type `Bar` (from the trait `Trait`) must be specified
@@ -10,7 +10,7 @@ error[E0191]: the value of the associated type `Bar` (from the trait `Trait`) mu
 LL |     type Bar;
    |     --------- `Bar` defined here
 ...
-LL | type Foo = Trait<F=i32>; //~ ERROR E0220
+LL | type Foo = Trait<F=i32>;
    |            ^^^^^^^^^^^^ associated type `Bar` must be specified
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0252.stderr b/src/test/ui/error-codes/E0252.stderr
index bd06241fc76..8486806c672 100644
--- a/src/test/ui/error-codes/E0252.stderr
+++ b/src/test/ui/error-codes/E0252.stderr
@@ -3,13 +3,13 @@ error[E0252]: the name `baz` is defined multiple times
    |
 LL | use foo::baz;
    |     -------- previous import of the type `baz` here
-LL | use bar::baz; //~ ERROR E0252
+LL | use bar::baz;
    |     ^^^^^^^^ `baz` reimported here
    |
    = note: `baz` must be defined only once in the type namespace of this module
 help: you can use `as` to change the binding name of the import
    |
-LL | use bar::baz as other_baz; //~ ERROR E0252
+LL | use bar::baz as other_baz;
    |     ^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0255.stderr b/src/test/ui/error-codes/E0255.stderr
index a47aa7c6592..36e4eeeaeea 100644
--- a/src/test/ui/error-codes/E0255.stderr
+++ b/src/test/ui/error-codes/E0255.stderr
@@ -4,7 +4,7 @@ error[E0255]: the name `foo` is defined multiple times
 LL | use bar::foo;
    |     -------- previous import of the value `foo` here
 LL | 
-LL | fn foo() {} //~ ERROR E0255
+LL | fn foo() {}
    | ^^^^^^^^ `foo` redefined here
    |
    = note: `foo` must be defined only once in the value namespace of this module
diff --git a/src/test/ui/error-codes/E0261.stderr b/src/test/ui/error-codes/E0261.stderr
index 9e64f6c3f14..3bf5e9d8154 100644
--- a/src/test/ui/error-codes/E0261.stderr
+++ b/src/test/ui/error-codes/E0261.stderr
@@ -1,13 +1,13 @@
 error[E0261]: use of undeclared lifetime name `'a`
   --> $DIR/E0261.rs:1:12
    |
-LL | fn foo(x: &'a str) { } //~ ERROR E0261
+LL | fn foo(x: &'a str) { }
    |            ^^ undeclared lifetime
 
 error[E0261]: use of undeclared lifetime name `'a`
   --> $DIR/E0261.rs:5:9
    |
-LL |     x: &'a str, //~ ERROR E0261
+LL |     x: &'a str,
    |         ^^ undeclared lifetime
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0262.stderr b/src/test/ui/error-codes/E0262.stderr
index 8f01889a470..ad90b717126 100644
--- a/src/test/ui/error-codes/E0262.stderr
+++ b/src/test/ui/error-codes/E0262.stderr
@@ -1,7 +1,7 @@
 error[E0262]: invalid lifetime parameter name: `'static`
   --> $DIR/E0262.rs:1:8
    |
-LL | fn foo<'static>(x: &'static str) { } //~ ERROR E0262
+LL | fn foo<'static>(x: &'static str) { }
    |        ^^^^^^^ 'static is a reserved lifetime name
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0264.stderr b/src/test/ui/error-codes/E0264.stderr
index bc6a0d9f96c..403c0aa4146 100644
--- a/src/test/ui/error-codes/E0264.stderr
+++ b/src/test/ui/error-codes/E0264.stderr
@@ -1,7 +1,7 @@
 error[E0264]: unknown external lang item: `cake`
   --> $DIR/E0264.rs:5:5
    |
-LL |     fn cake(); //~ ERROR E0264
+LL |     fn cake();
    |     ^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0267.stderr b/src/test/ui/error-codes/E0267.stderr
index 3506c1c0f16..b14cfd1a52d 100644
--- a/src/test/ui/error-codes/E0267.stderr
+++ b/src/test/ui/error-codes/E0267.stderr
@@ -1,7 +1,7 @@
 error[E0267]: `break` inside of a closure
   --> $DIR/E0267.rs:2:18
    |
-LL |     let w = || { break; }; //~ ERROR E0267
+LL |     let w = || { break; };
    |                  ^^^^^ cannot break inside of a closure
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0268.stderr b/src/test/ui/error-codes/E0268.stderr
index 3e276bd1acb..3c77e7f3df2 100644
--- a/src/test/ui/error-codes/E0268.stderr
+++ b/src/test/ui/error-codes/E0268.stderr
@@ -1,7 +1,7 @@
 error[E0268]: `break` outside of loop
   --> $DIR/E0268.rs:2:5
    |
-LL |     break; //~ ERROR E0268
+LL |     break;
    |     ^^^^^ cannot break outside of a loop
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0271.stderr b/src/test/ui/error-codes/E0271.stderr
index 8fcb68e434f..16c3ab9d742 100644
--- a/src/test/ui/error-codes/E0271.stderr
+++ b/src/test/ui/error-codes/E0271.stderr
@@ -1,7 +1,7 @@
 error[E0271]: type mismatch resolving `<i8 as Trait>::AssociatedType == u32`
   --> $DIR/E0271.rs:10:5
    |
-LL |     foo(3_i8); //~ ERROR E0271
+LL |     foo(3_i8);
    |     ^^^ expected reference, found u32
    |
    = note: expected type `&'static str`
diff --git a/src/test/ui/error-codes/E0275.stderr b/src/test/ui/error-codes/E0275.stderr
index f2b0f392bc8..01a923a53a2 100644
--- a/src/test/ui/error-codes/E0275.stderr
+++ b/src/test/ui/error-codes/E0275.stderr
@@ -1,7 +1,7 @@
 error[E0275]: overflow evaluating the requirement `Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<T>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>: Foo`
   --> $DIR/E0275.rs:5:1
    |
-LL | impl<T> Foo for T where Bar<T>: Foo {} //~ ERROR E0275
+LL | impl<T> Foo for T where Bar<T>: Foo {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: consider adding a `#![recursion_limit="128"]` attribute to your crate
diff --git a/src/test/ui/error-codes/E0276.stderr b/src/test/ui/error-codes/E0276.stderr
index 393ad8c81a0..a8b016ebf52 100644
--- a/src/test/ui/error-codes/E0276.stderr
+++ b/src/test/ui/error-codes/E0276.stderr
@@ -4,7 +4,7 @@ error[E0276]: impl has stricter requirements than trait
 LL |     fn foo<T>(x: T);
    |     ---------------- definition of `foo` from trait
 ...
-LL |     fn foo<T>(x: T) where T: Copy {} //~ ERROR E0276
+LL |     fn foo<T>(x: T) where T: Copy {}
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ impl has extra requirement `T: std::marker::Copy`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0282.stderr b/src/test/ui/error-codes/E0282.stderr
index 49165d1e42b..3a5040eb6da 100644
--- a/src/test/ui/error-codes/E0282.stderr
+++ b/src/test/ui/error-codes/E0282.stderr
@@ -1,7 +1,7 @@
 error[E0282]: type annotations needed
   --> $DIR/E0282.rs:2:9
    |
-LL |     let x = "hello".chars().rev().collect(); //~ ERROR E0282
+LL |     let x = "hello".chars().rev().collect();
    |         ^
    |         |
    |         cannot infer type
diff --git a/src/test/ui/error-codes/E0283.stderr b/src/test/ui/error-codes/E0283.stderr
index 598ec672ce6..e1f53e592fc 100644
--- a/src/test/ui/error-codes/E0283.stderr
+++ b/src/test/ui/error-codes/E0283.stderr
@@ -1,7 +1,7 @@
 error[E0283]: type annotations required: cannot resolve `_: Generator`
   --> $DIR/E0283.rs:18:21
    |
-LL |     let cont: u32 = Generator::create(); //~ ERROR E0283
+LL |     let cont: u32 = Generator::create();
    |                     ^^^^^^^^^^^^^^^^^
    |
 note: required by `Generator::create`
diff --git a/src/test/ui/error-codes/E0301.stderr b/src/test/ui/error-codes/E0301.stderr
index 3cfacd5983f..80ee681a517 100644
--- a/src/test/ui/error-codes/E0301.stderr
+++ b/src/test/ui/error-codes/E0301.stderr
@@ -1,7 +1,7 @@
 error[E0301]: cannot mutably borrow in a pattern guard
   --> $DIR/E0301.rs:4:19
    |
-LL |         option if option.take().is_none() => {}, //~ ERROR E0301
+LL |         option if option.take().is_none() => {},
    |                   ^^^^^^ borrowed mutably in pattern guard
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0302.stderr b/src/test/ui/error-codes/E0302.stderr
index 66b31361762..69ebb6bb9c9 100644
--- a/src/test/ui/error-codes/E0302.stderr
+++ b/src/test/ui/error-codes/E0302.stderr
@@ -1,7 +1,7 @@
 error[E0302]: cannot assign in a pattern guard
   --> $DIR/E0302.rs:4:21
    |
-LL |         option if { option = None; false } => { }, //~ ERROR E0302
+LL |         option if { option = None; false } => { },
    |                     ^^^^^^^^^^^^^ assignment in pattern guard
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0308-4.stderr b/src/test/ui/error-codes/E0308-4.stderr
index f69a3893365..3c51106cae8 100644
--- a/src/test/ui/error-codes/E0308-4.stderr
+++ b/src/test/ui/error-codes/E0308-4.stderr
@@ -3,7 +3,7 @@ error[E0308]: mismatched types
    |
 LL |     match x {
    |           - this match expression has type `u8`
-LL |         0u8..=3i8 => (), //~ ERROR E0308
+LL |         0u8..=3i8 => (),
    |         ^^^^^^^^^ expected u8, found i8
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0308.stderr b/src/test/ui/error-codes/E0308.stderr
index 8c71747fbcd..bd9834ceb9f 100644
--- a/src/test/ui/error-codes/E0308.stderr
+++ b/src/test/ui/error-codes/E0308.stderr
@@ -1,7 +1,7 @@
 error[E0308]: intrinsic has wrong type
   --> $DIR/E0308.rs:4:5
    |
-LL |     fn size_of<T>(); //~ ERROR E0308
+LL |     fn size_of<T>();
    |     ^^^^^^^^^^^^^^^^ expected (), found usize
    |
    = note: expected type `extern "rust-intrinsic" fn()`
diff --git a/src/test/ui/error-codes/E0370.stderr b/src/test/ui/error-codes/E0370.stderr
index cd1903bd7e2..7fb622ee80b 100644
--- a/src/test/ui/error-codes/E0370.stderr
+++ b/src/test/ui/error-codes/E0370.stderr
@@ -1,7 +1,7 @@
 error[E0370]: enum discriminant overflowed
   --> $DIR/E0370.rs:7:5
    |
-LL |     Y, //~ ERROR E0370
+LL |     Y,
    |     ^ overflowed on value after 9223372036854775807
    |
    = note: explicitly set `Y = -9223372036854775808` if that is desired outcome
diff --git a/src/test/ui/error-codes/E0374.stderr b/src/test/ui/error-codes/E0374.stderr
index 9226ca0e478..7ab0f82fc23 100644
--- a/src/test/ui/error-codes/E0374.stderr
+++ b/src/test/ui/error-codes/E0374.stderr
@@ -1,7 +1,7 @@
 error[E0374]: the trait `CoerceUnsized` may only be implemented for a coercion between structures with one field being coerced, none found
   --> $DIR/E0374.rs:8:1
    |
-LL | / impl<T, U> CoerceUnsized<Foo<U>> for Foo<T> //~ ERROR E0374
+LL | / impl<T, U> CoerceUnsized<Foo<U>> for Foo<T>
 LL | |     where T: CoerceUnsized<U> {}
    | |________________________________^
 
diff --git a/src/test/ui/error-codes/E0376.stderr b/src/test/ui/error-codes/E0376.stderr
index 2894a919632..015448c39ea 100644
--- a/src/test/ui/error-codes/E0376.stderr
+++ b/src/test/ui/error-codes/E0376.stderr
@@ -1,7 +1,7 @@
 error[E0376]: the trait `CoerceUnsized` may only be implemented for a coercion between structures
   --> $DIR/E0376.rs:8:1
    |
-LL | impl<T, U> CoerceUnsized<U> for Foo<T> {} //~ ERROR E0376
+LL | impl<T, U> CoerceUnsized<U> for Foo<T> {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0388.stderr b/src/test/ui/error-codes/E0388.stderr
index f641830ae9f..3f662459c84 100644
--- a/src/test/ui/error-codes/E0388.stderr
+++ b/src/test/ui/error-codes/E0388.stderr
@@ -1,31 +1,31 @@
 error[E0017]: references in constants may only refer to immutable values
   --> $DIR/E0388.rs:4:30
    |
-LL | const CR: &'static mut i32 = &mut C; //~ ERROR E0017
+LL | const CR: &'static mut i32 = &mut C;
    |                              ^^^^^^ constants require immutable values
 
 error[E0017]: references in statics may only refer to immutable values
   --> $DIR/E0388.rs:5:39
    |
-LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
+LL | static STATIC_REF: &'static mut i32 = &mut X;
    |                                       ^^^^^^ statics require immutable values
 
 error: cannot mutate statics in the initializer of another static
   --> $DIR/E0388.rs:5:39
    |
-LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
+LL | static STATIC_REF: &'static mut i32 = &mut X;
    |                                       ^^^^^^
 
 error[E0596]: cannot borrow immutable static item as mutable
   --> $DIR/E0388.rs:5:44
    |
-LL | static STATIC_REF: &'static mut i32 = &mut X; //~ ERROR E0017
+LL | static STATIC_REF: &'static mut i32 = &mut X;
    |                                            ^
 
 error[E0017]: references in statics may only refer to immutable values
   --> $DIR/E0388.rs:8:38
    |
-LL | static CONST_REF: &'static mut i32 = &mut C; //~ ERROR E0017
+LL | static CONST_REF: &'static mut i32 = &mut C;
    |                                      ^^^^^^ statics require immutable values
 
 error: aborting due to 5 previous errors
diff --git a/src/test/ui/error-codes/E0389.stderr b/src/test/ui/error-codes/E0389.stderr
index cc8914ef3a6..927eace727e 100644
--- a/src/test/ui/error-codes/E0389.stderr
+++ b/src/test/ui/error-codes/E0389.stderr
@@ -1,7 +1,7 @@
 error[E0389]: cannot assign to data in a `&` reference
   --> $DIR/E0389.rs:8:5
    |
-LL |     fancy_ref.num = 6; //~ ERROR E0389
+LL |     fancy_ref.num = 6;
    |     ^^^^^^^^^^^^^^^^^ assignment into an immutable reference
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0390.stderr b/src/test/ui/error-codes/E0390.stderr
index 7632229360e..3ca3a77c74f 100644
--- a/src/test/ui/error-codes/E0390.stderr
+++ b/src/test/ui/error-codes/E0390.stderr
@@ -1,13 +1,13 @@
 error[E0390]: only a single inherent implementation marked with `#[lang = "mut_ptr"]` is allowed for the `*mut T` primitive
   --> $DIR/E0390.rs:5:1
    |
-LL | impl *mut Foo {} //~ ERROR E0390
+LL | impl *mut Foo {}
    | ^^^^^^^^^^^^^^^^
    |
 help: consider using a trait to implement these methods
   --> $DIR/E0390.rs:5:1
    |
-LL | impl *mut Foo {} //~ ERROR E0390
+LL | impl *mut Foo {}
    | ^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0392.stderr b/src/test/ui/error-codes/E0392.stderr
index 4bb3b87bb4a..18419572233 100644
--- a/src/test/ui/error-codes/E0392.stderr
+++ b/src/test/ui/error-codes/E0392.stderr
@@ -1,7 +1,7 @@
 error[E0392]: parameter `T` is never used
   --> $DIR/E0392.rs:1:10
    |
-LL | enum Foo<T> { Bar } //~ ERROR E0392
+LL | enum Foo<T> { Bar }
    |          ^ unused type parameter
    |
    = help: consider removing `T` or using a marker such as `std::marker::PhantomData`
diff --git a/src/test/ui/error-codes/E0395.stderr b/src/test/ui/error-codes/E0395.stderr
index cc7d94e22eb..9d80acb515d 100644
--- a/src/test/ui/error-codes/E0395.stderr
+++ b/src/test/ui/error-codes/E0395.stderr
@@ -1,7 +1,7 @@
 error[E0658]: comparing raw pointers inside static (see issue #53020)
   --> $DIR/E0395.rs:6:29
    |
-LL | static BAZ: bool = unsafe { (&FOO as *const i32) == (&BAR as *const i32) }; //~ ERROR issue #53020
+LL | static BAZ: bool = unsafe { (&FOO as *const i32) == (&BAR as *const i32) };
    |                             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = help: add #![feature(const_compare_raw_pointers)] to the crate attributes to enable
diff --git a/src/test/ui/error-codes/E0401.stderr b/src/test/ui/error-codes/E0401.stderr
index 27f281ee437..7c54e5b4edb 100644
--- a/src/test/ui/error-codes/E0401.stderr
+++ b/src/test/ui/error-codes/E0401.stderr
@@ -3,7 +3,7 @@ error[E0401]: can't use generic parameters from outer function
    |
 LL | fn foo<T>(x: T) {
    |        - type variable from outer function
-LL |     fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) { //~ ERROR E0401
+LL |     fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) {
    |        ---------------------------    ^ use of generic parameter from outer function
    |        |
    |        help: try using a local generic parameter instead: `bfnr<U, V: Baz<U>, W: Fn(), T>`
@@ -17,7 +17,7 @@ LL | fn foo<T>(x: T) {
 LL |     fn baz<U,
    |        --- try adding a local generic parameter in this method instead
 ...
-LL |            (y: T) { //~ ERROR E0401
+LL |            (y: T) {
    |                ^ use of generic parameter from outer function
 
 error[E0401]: can't use generic parameters from outer function
@@ -26,7 +26,7 @@ error[E0401]: can't use generic parameters from outer function
 LL | impl<T> Iterator for A<T> {
    | ---- `Self` type implicitly declared here, by this `impl`
 ...
-LL |         fn helper(sel: &Self) -> u8 { //~ ERROR E0401
+LL |         fn helper(sel: &Self) -> u8 {
    |                         ^^^^
    |                         |
    |                         use of generic parameter from outer function
diff --git a/src/test/ui/error-codes/E0403.stderr b/src/test/ui/error-codes/E0403.stderr
index b9246475029..2bd7de6c246 100644
--- a/src/test/ui/error-codes/E0403.stderr
+++ b/src/test/ui/error-codes/E0403.stderr
@@ -1,7 +1,7 @@
 error[E0403]: the name `T` is already used for a generic parameter in this list of generic parameters
   --> $DIR/E0403.rs:1:11
    |
-LL | fn foo<T, T>(s: T, u: T) {} //~ ERROR E0403
+LL | fn foo<T, T>(s: T, u: T) {}
    |        -  ^ already used
    |        |
    |        first use of `T`
diff --git a/src/test/ui/error-codes/E0404.stderr b/src/test/ui/error-codes/E0404.stderr
index f84fd52c851..4ccb6c5728e 100644
--- a/src/test/ui/error-codes/E0404.stderr
+++ b/src/test/ui/error-codes/E0404.stderr
@@ -1,13 +1,13 @@
 error[E0404]: expected trait, found struct `Foo`
   --> $DIR/E0404.rs:4:6
    |
-LL | impl Foo for Bar {} //~ ERROR E0404
+LL | impl Foo for Bar {}
    |      ^^^ not a trait
 
 error[E0404]: expected trait, found struct `Foo`
   --> $DIR/E0404.rs:8:11
    |
-LL | fn baz<T: Foo>(_: T) {} //~ ERROR E0404
+LL | fn baz<T: Foo>(_: T) {}
    |           ^^^ not a trait
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0405.stderr b/src/test/ui/error-codes/E0405.stderr
index 2f09a525e45..a22afe6f3e8 100644
--- a/src/test/ui/error-codes/E0405.stderr
+++ b/src/test/ui/error-codes/E0405.stderr
@@ -1,7 +1,7 @@
 error[E0405]: cannot find trait `SomeTrait` in this scope
   --> $DIR/E0405.rs:3:6
    |
-LL | impl SomeTrait for Foo {} //~ ERROR E0405
+LL | impl SomeTrait for Foo {}
    |      ^^^^^^^^^ not found in this scope
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0408.stderr b/src/test/ui/error-codes/E0408.stderr
index dc0a41e6eb0..132a9432254 100644
--- a/src/test/ui/error-codes/E0408.stderr
+++ b/src/test/ui/error-codes/E0408.stderr
@@ -1,7 +1,7 @@
 error[E0408]: variable `y` is not bound in all patterns
   --> $DIR/E0408.rs:5:19
    |
-LL |         Some(y) | None => {} //~  ERROR variable `y` is not bound in all patterns
+LL |         Some(y) | None => {}
    |              -    ^^^^ pattern doesn't bind `y`
    |              |
    |              variable not in all patterns
diff --git a/src/test/ui/error-codes/E0411.stderr b/src/test/ui/error-codes/E0411.stderr
index fe78d8d957e..c1c25e835c1 100644
--- a/src/test/ui/error-codes/E0411.stderr
+++ b/src/test/ui/error-codes/E0411.stderr
@@ -1,7 +1,7 @@
 error[E0411]: cannot find type `Self` in this scope
   --> $DIR/E0411.rs:2:6
    |
-LL |     <Self>::foo; //~ ERROR E0411
+LL |     <Self>::foo;
    |      ^^^^ `Self` is only available in impls, traits, and type definitions
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0412.stderr b/src/test/ui/error-codes/E0412.stderr
index 68d636ffae0..7bdaa180730 100644
--- a/src/test/ui/error-codes/E0412.stderr
+++ b/src/test/ui/error-codes/E0412.stderr
@@ -1,7 +1,7 @@
 error[E0412]: cannot find type `Something` in this scope
   --> $DIR/E0412.rs:1:6
    |
-LL | impl Something {} //~ ERROR E0412
+LL | impl Something {}
    |      ^^^^^^^^^ not found in this scope
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0415.stderr b/src/test/ui/error-codes/E0415.stderr
index 6e848f9bfd3..c2b8fdc7c55 100644
--- a/src/test/ui/error-codes/E0415.stderr
+++ b/src/test/ui/error-codes/E0415.stderr
@@ -1,7 +1,7 @@
 error[E0415]: identifier `f` is bound more than once in this parameter list
   --> $DIR/E0415.rs:1:16
    |
-LL | fn foo(f: i32, f: i32) {} //~ ERROR E0415
+LL | fn foo(f: i32, f: i32) {}
    |                ^ used as parameter more than once
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0416.stderr b/src/test/ui/error-codes/E0416.stderr
index 4baf5006cf4..78acac5c661 100644
--- a/src/test/ui/error-codes/E0416.stderr
+++ b/src/test/ui/error-codes/E0416.stderr
@@ -1,7 +1,7 @@
 error[E0416]: identifier `x` is bound more than once in the same pattern
   --> $DIR/E0416.rs:3:13
    |
-LL |         (x, x) => {} //~ ERROR E0416
+LL |         (x, x) => {}
    |             ^ used in a pattern more than once
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0423.stderr b/src/test/ui/error-codes/E0423.stderr
index d0deb8ce7ea..bdcfaae60a0 100644
--- a/src/test/ui/error-codes/E0423.stderr
+++ b/src/test/ui/error-codes/E0423.stderr
@@ -19,7 +19,7 @@ LL |     for _ in std::ops::Range { start: 0, end: 10 } {}
 error[E0423]: expected function, found struct `Foo`
   --> $DIR/E0423.rs:4:13
    |
-LL |     let f = Foo(); //~ ERROR E0423
+LL |     let f = Foo();
    |             ^^^
    |             |
    |             did you mean `Foo { /* fields */ }`?
diff --git a/src/test/ui/error-codes/E0424.stderr b/src/test/ui/error-codes/E0424.stderr
index b91f061db34..d67a2660dac 100644
--- a/src/test/ui/error-codes/E0424.stderr
+++ b/src/test/ui/error-codes/E0424.stderr
@@ -1,13 +1,13 @@
 error[E0424]: expected value, found module `self`
   --> $DIR/E0424.rs:7:9
    |
-LL |         self.bar(); //~ ERROR E0424
+LL |         self.bar();
    |         ^^^^ `self` value is a keyword only available in methods with `self` parameter
 
 error[E0424]: expected unit struct/variant or constant, found module `self`
   --> $DIR/E0424.rs:12:9
    |
-LL |     let self = "self"; //~ ERROR E0424
+LL |     let self = "self";
    |         ^^^^ `self` value is a keyword and may not be bound to variables or shadowed
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0425.stderr b/src/test/ui/error-codes/E0425.stderr
index 391027a5184..9ef4608da7d 100644
--- a/src/test/ui/error-codes/E0425.stderr
+++ b/src/test/ui/error-codes/E0425.stderr
@@ -1,7 +1,7 @@
 error[E0425]: cannot find value `elf` in this scope
   --> $DIR/E0425.rs:3:9
    |
-LL |         elf; //~ ERROR E0425
+LL |         elf;
    |         ^^^ not found in this scope
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0428.stderr b/src/test/ui/error-codes/E0428.stderr
index 2154cb0ead2..205bcf342f1 100644
--- a/src/test/ui/error-codes/E0428.stderr
+++ b/src/test/ui/error-codes/E0428.stderr
@@ -1,9 +1,9 @@
 error[E0428]: the name `Bar` is defined multiple times
   --> $DIR/E0428.rs:2:1
    |
-LL | struct Bar; //~ previous definition of the type `Bar` here
+LL | struct Bar;
    | ----------- previous definition of the type `Bar` here
-LL | struct Bar; //~ ERROR E0428
+LL | struct Bar;
    | ^^^^^^^^^^^ `Bar` redefined here
    |
    = note: `Bar` must be defined only once in the type namespace of this module
diff --git a/src/test/ui/error-codes/E0429.stderr b/src/test/ui/error-codes/E0429.stderr
index 13cdb0d8861..b5f76a1fcd8 100644
--- a/src/test/ui/error-codes/E0429.stderr
+++ b/src/test/ui/error-codes/E0429.stderr
@@ -1,7 +1,7 @@
 error[E0429]: `self` imports are only allowed within a { } list
   --> $DIR/E0429.rs:1:5
    |
-LL | use std::fmt::self; //~ ERROR E0429
+LL | use std::fmt::self;
    |     ^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0430.stderr b/src/test/ui/error-codes/E0430.stderr
index 78e4e43ac2f..9f8b053de2c 100644
--- a/src/test/ui/error-codes/E0430.stderr
+++ b/src/test/ui/error-codes/E0430.stderr
@@ -1,7 +1,7 @@
 error[E0430]: `self` import can only appear once in an import list
   --> $DIR/E0430.rs:1:16
    |
-LL | use std::fmt::{self, self}; //~ ERROR E0430
+LL | use std::fmt::{self, self};
    |                ^^^^  ---- another `self` import appears here
    |                |
    |                can only appear once in an import list
@@ -9,7 +9,7 @@ LL | use std::fmt::{self, self}; //~ ERROR E0430
 error[E0252]: the name `fmt` is defined multiple times
   --> $DIR/E0430.rs:1:22
    |
-LL | use std::fmt::{self, self}; //~ ERROR E0430
+LL | use std::fmt::{self, self};
    |                ------^^^^
    |                |   | |
    |                |   | `fmt` reimported here
diff --git a/src/test/ui/error-codes/E0431.stderr b/src/test/ui/error-codes/E0431.stderr
index 240e6bd4a82..adfd2d923c7 100644
--- a/src/test/ui/error-codes/E0431.stderr
+++ b/src/test/ui/error-codes/E0431.stderr
@@ -1,7 +1,7 @@
 error[E0431]: `self` import can only appear in an import list with a non-empty prefix
   --> $DIR/E0431.rs:1:6
    |
-LL | use {self}; //~ ERROR E0431
+LL | use {self};
    |      ^^^^ can only appear in an import list with a non-empty prefix
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0432.stderr b/src/test/ui/error-codes/E0432.stderr
index bb6b31242cb..137a1af6f95 100644
--- a/src/test/ui/error-codes/E0432.stderr
+++ b/src/test/ui/error-codes/E0432.stderr
@@ -1,7 +1,7 @@
 error[E0432]: unresolved import `something`
   --> $DIR/E0432.rs:1:5
    |
-LL | use something::Foo; //~ ERROR E0432
+LL | use something::Foo;
    |     ^^^^^^^^^ maybe a missing `extern crate something;`?
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0433.stderr b/src/test/ui/error-codes/E0433.stderr
index 7fbb7fa0413..d852e188384 100644
--- a/src/test/ui/error-codes/E0433.stderr
+++ b/src/test/ui/error-codes/E0433.stderr
@@ -1,7 +1,7 @@
 error[E0433]: failed to resolve: use of undeclared type or module `HashMap`
   --> $DIR/E0433.rs:2:15
    |
-LL |     let map = HashMap::new(); //~ ERROR E0433
+LL |     let map = HashMap::new();
    |               ^^^^^^^ use of undeclared type or module `HashMap`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0434.stderr b/src/test/ui/error-codes/E0434.stderr
index 0e2bc701b7f..14508ccbc9a 100644
--- a/src/test/ui/error-codes/E0434.stderr
+++ b/src/test/ui/error-codes/E0434.stderr
@@ -1,7 +1,7 @@
 error[E0434]: can't capture dynamic environment in a fn item
   --> $DIR/E0434.rs:4:9
    |
-LL |         y //~ ERROR E0434
+LL |         y
    |         ^
    |
    = help: use the `|| { ... }` closure form instead
diff --git a/src/test/ui/error-codes/E0435.stderr b/src/test/ui/error-codes/E0435.stderr
index 09c9d19e114..349aa0d07c5 100644
--- a/src/test/ui/error-codes/E0435.stderr
+++ b/src/test/ui/error-codes/E0435.stderr
@@ -1,7 +1,7 @@
 error[E0435]: attempt to use a non-constant value in a constant
   --> $DIR/E0435.rs:3:17
    |
-LL |     let _: [u8; foo]; //~ ERROR E0435
+LL |     let _: [u8; foo];
    |                 ^^^ non-constant value
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0437.stderr b/src/test/ui/error-codes/E0437.stderr
index 9470cbf176a..217b164036f 100644
--- a/src/test/ui/error-codes/E0437.stderr
+++ b/src/test/ui/error-codes/E0437.stderr
@@ -1,7 +1,7 @@
 error[E0437]: type `Bar` is not a member of trait `Foo`
   --> $DIR/E0437.rs:4:5
    |
-LL |     type Bar = bool; //~ ERROR E0437
+LL |     type Bar = bool;
    |     ^^^^^^^^^^^^^^^^ not a member of trait `Foo`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0438.stderr b/src/test/ui/error-codes/E0438.stderr
index 6a11577bb0f..853f0c3c239 100644
--- a/src/test/ui/error-codes/E0438.stderr
+++ b/src/test/ui/error-codes/E0438.stderr
@@ -1,7 +1,7 @@
 error[E0438]: const `BAR` is not a member of trait `Bar`
   --> $DIR/E0438.rs:4:5
    |
-LL |     const BAR: bool = true; //~ ERROR E0438
+LL |     const BAR: bool = true;
    |     ^^^^^^^^^^^^^^^^^^^^^^^ not a member of trait `Bar`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0439.stderr b/src/test/ui/error-codes/E0439.stderr
index e3b8fbfb253..8021f7d3951 100644
--- a/src/test/ui/error-codes/E0439.stderr
+++ b/src/test/ui/error-codes/E0439.stderr
@@ -1,7 +1,7 @@
 error[E0439]: invalid `simd_shuffle`, needs length: `simd_shuffle`
   --> $DIR/E0439.rs:4:5
    |
-LL |     fn simd_shuffle<A,B>(a: A, b: A, c: [u32; 8]) -> B; //~ ERROR E0439
+LL |     fn simd_shuffle<A,B>(a: A, b: A, c: [u32; 8]) -> B;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0446.stderr b/src/test/ui/error-codes/E0446.stderr
index 9c7399515f4..a0f5f7079b3 100644
--- a/src/test/ui/error-codes/E0446.stderr
+++ b/src/test/ui/error-codes/E0446.stderr
@@ -4,7 +4,7 @@ error[E0446]: private type `foo::Bar` in public interface
 LL |       struct Bar(u32);
    |       - `foo::Bar` declared as private
 LL | 
-LL | /     pub fn bar() -> Bar { //~ ERROR E0446
+LL | /     pub fn bar() -> Bar {
 LL | |         Bar(0)
 LL | |     }
    | |_____^ can't leak private type
diff --git a/src/test/ui/error-codes/E0449.stderr b/src/test/ui/error-codes/E0449.stderr
index d623c8abbd9..8221a5e0ad6 100644
--- a/src/test/ui/error-codes/E0449.stderr
+++ b/src/test/ui/error-codes/E0449.stderr
@@ -1,7 +1,7 @@
 error[E0449]: unnecessary visibility qualifier
   --> $DIR/E0449.rs:7:1
    |
-LL | pub impl Bar {} //~ ERROR E0449
+LL | pub impl Bar {}
    | ^^^ `pub` not permitted here because it's implied
    |
    = note: place qualifiers on individual impl items instead
@@ -9,13 +9,13 @@ LL | pub impl Bar {} //~ ERROR E0449
 error[E0449]: unnecessary visibility qualifier
   --> $DIR/E0449.rs:9:1
    |
-LL | pub impl Foo for Bar { //~ ERROR E0449
+LL | pub impl Foo for Bar {
    | ^^^ `pub` not permitted here because it's implied
 
 error[E0449]: unnecessary visibility qualifier
   --> $DIR/E0449.rs:10:5
    |
-LL |     pub fn foo() {} //~ ERROR E0449
+LL |     pub fn foo() {}
    |     ^^^ `pub` not permitted here because it's implied
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/error-codes/E0451.stderr b/src/test/ui/error-codes/E0451.stderr
index 11f08677246..655f3a98d7f 100644
--- a/src/test/ui/error-codes/E0451.stderr
+++ b/src/test/ui/error-codes/E0451.stderr
@@ -1,13 +1,13 @@
 error[E0451]: field `b` of struct `bar::Foo` is private
   --> $DIR/E0451.rs:14:21
    |
-LL |     let bar::Foo{a, b} = foo; //~ ERROR E0451
+LL |     let bar::Foo{a, b} = foo;
    |                     ^ field `b` is private
 
 error[E0451]: field `b` of struct `bar::Foo` is private
   --> $DIR/E0451.rs:18:29
    |
-LL |     let f = bar::Foo{ a: 0, b: 0 }; //~ ERROR E0451
+LL |     let f = bar::Foo{ a: 0, b: 0 };
    |                             ^^^^ field `b` is private
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0452.stderr b/src/test/ui/error-codes/E0452.stderr
index 62f268cd432..7c3093309f9 100644
--- a/src/test/ui/error-codes/E0452.stderr
+++ b/src/test/ui/error-codes/E0452.stderr
@@ -1,7 +1,7 @@
 error[E0452]: malformed lint attribute
   --> $DIR/E0452.rs:1:10
    |
-LL | #![allow(foo = "")] //~ ERROR E0452
+LL | #![allow(foo = "")]
    |          ^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0458.stderr b/src/test/ui/error-codes/E0458.stderr
index 8b071e0b315..9cfe7cccac1 100644
--- a/src/test/ui/error-codes/E0458.stderr
+++ b/src/test/ui/error-codes/E0458.stderr
@@ -1,7 +1,7 @@
 error[E0458]: unknown kind: `wonderful_unicorn`
   --> $DIR/E0458.rs:1:1
    |
-LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
+LL | #[link(kind = "wonderful_unicorn")] extern {}
    | ^^^^^^^--------------------------^^
    |        |
    |        unknown kind
@@ -9,7 +9,7 @@ LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
 error[E0459]: #[link(...)] specified without `name = "foo"`
   --> $DIR/E0458.rs:1:1
    |
-LL | #[link(kind = "wonderful_unicorn")] extern {} //~ ERROR E0458
+LL | #[link(kind = "wonderful_unicorn")] extern {}
    | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0459.stderr b/src/test/ui/error-codes/E0459.stderr
index d3591cd5f60..da7069fbb47 100644
--- a/src/test/ui/error-codes/E0459.stderr
+++ b/src/test/ui/error-codes/E0459.stderr
@@ -1,7 +1,7 @@
 error[E0459]: #[link(...)] specified without `name = "foo"`
   --> $DIR/E0459.rs:1:1
    |
-LL | #[link(kind = "dylib")] extern {} //~ ERROR E0459
+LL | #[link(kind = "dylib")] extern {}
    | ^^^^^^^^^^^^^^^^^^^^^^^ missing `name` argument
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0478.stderr b/src/test/ui/error-codes/E0478.stderr
index 5147bf24559..71e490364d7 100644
--- a/src/test/ui/error-codes/E0478.stderr
+++ b/src/test/ui/error-codes/E0478.stderr
@@ -1,7 +1,7 @@
 error[E0478]: lifetime bound not satisfied
   --> $DIR/E0478.rs:4:5
    |
-LL |     child: Box<Wedding<'kiss> + 'SnowWhite>, //~ ERROR E0478
+LL |     child: Box<Wedding<'kiss> + 'SnowWhite>,
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
 note: lifetime parameter instantiated with the lifetime 'SnowWhite as defined on the struct at 3:22
diff --git a/src/test/ui/error-codes/E0492.stderr b/src/test/ui/error-codes/E0492.stderr
index b73db6c975e..5f337dd7f42 100644
--- a/src/test/ui/error-codes/E0492.stderr
+++ b/src/test/ui/error-codes/E0492.stderr
@@ -1,7 +1,7 @@
 error[E0492]: cannot borrow a constant which may contain interior mutability, create a static instead
   --> $DIR/E0492.rs:4:34
    |
-LL | static B: &'static AtomicUsize = &A; //~ ERROR E0492
+LL | static B: &'static AtomicUsize = &A;
    |                                  ^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0496.stderr b/src/test/ui/error-codes/E0496.stderr
index 515d71ba05e..b0294eef04e 100644
--- a/src/test/ui/error-codes/E0496.stderr
+++ b/src/test/ui/error-codes/E0496.stderr
@@ -3,7 +3,7 @@ error[E0496]: lifetime name `'a` shadows a lifetime name that is already in scop
    |
 LL | impl<'a> Foo<'a> {
    |      -- first declared here
-LL |     fn f<'a>(x: &'a i32) { //~ ERROR E0496
+LL |     fn f<'a>(x: &'a i32) {
    |          ^^ lifetime 'a already in scope
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0499.stderr b/src/test/ui/error-codes/E0499.stderr
index 92157e4eba6..82270162b38 100644
--- a/src/test/ui/error-codes/E0499.stderr
+++ b/src/test/ui/error-codes/E0499.stderr
@@ -3,7 +3,7 @@ error[E0499]: cannot borrow `i` as mutable more than once at a time
    |
 LL |     let mut x = &mut i;
    |                      - first mutable borrow occurs here
-LL |     let mut a = &mut i; //~ ERROR E0499
+LL |     let mut a = &mut i;
    |                      ^ second mutable borrow occurs here
 ...
 LL | }
diff --git a/src/test/ui/error-codes/E0502.stderr b/src/test/ui/error-codes/E0502.stderr
index 9193886b009..26a2c3bf353 100644
--- a/src/test/ui/error-codes/E0502.stderr
+++ b/src/test/ui/error-codes/E0502.stderr
@@ -3,7 +3,7 @@ error[E0502]: cannot borrow `*a` as mutable because `a` is also borrowed as immu
    |
 LL |     let ref y = a;
    |         ----- immutable borrow occurs here
-LL |     bar(a); //~ ERROR E0502
+LL |     bar(a);
    |         ^ mutable borrow occurs here
 LL |     y.use_ref();
 LL | }
diff --git a/src/test/ui/error-codes/E0503.stderr b/src/test/ui/error-codes/E0503.stderr
index 83391146b60..62cb3afca78 100644
--- a/src/test/ui/error-codes/E0503.stderr
+++ b/src/test/ui/error-codes/E0503.stderr
@@ -3,7 +3,7 @@ error[E0503]: cannot use `value` because it was mutably borrowed
    |
 LL |     let _borrow = &mut value;
    |                        ----- borrow of `value` occurs here
-LL |     let _sum = value + 1; //~ ERROR E0503
+LL |     let _sum = value + 1;
    |                ^^^^^ use of borrowed `value`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0504.stderr b/src/test/ui/error-codes/E0504.stderr
index 7f4a611c5d5..a987713a11d 100644
--- a/src/test/ui/error-codes/E0504.stderr
+++ b/src/test/ui/error-codes/E0504.stderr
@@ -4,7 +4,7 @@ error[E0504]: cannot move `fancy_num` into closure because it is borrowed
 LL |     let fancy_ref = &fancy_num;
    |                      --------- borrow of `fancy_num` occurs here
 ...
-LL |         println!("child function: {}", fancy_num.num); //~ ERROR E0504
+LL |         println!("child function: {}", fancy_num.num);
    |                                        ^^^^^^^^^ move into closure occurs here
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0505.stderr b/src/test/ui/error-codes/E0505.stderr
index 268eb880192..28dfb25986f 100644
--- a/src/test/ui/error-codes/E0505.stderr
+++ b/src/test/ui/error-codes/E0505.stderr
@@ -3,7 +3,7 @@ error[E0505]: cannot move out of `x` because it is borrowed
    |
 LL |         let _ref_to_val: &Value = &x;
    |                                    - borrow of `x` occurs here
-LL |         eat(x); //~ ERROR E0505
+LL |         eat(x);
    |             ^ move out of `x` occurs here
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0507.stderr b/src/test/ui/error-codes/E0507.stderr
index c24b8ecf61a..1a596af1572 100644
--- a/src/test/ui/error-codes/E0507.stderr
+++ b/src/test/ui/error-codes/E0507.stderr
@@ -1,7 +1,7 @@
 error[E0507]: cannot move out of borrowed content
   --> $DIR/E0507.rs:12:5
    |
-LL |     x.borrow().nothing_is_true(); //~ ERROR E0507
+LL |     x.borrow().nothing_is_true();
    |     ^^^^^^^^^^ cannot move out of borrowed content
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0509.stderr b/src/test/ui/error-codes/E0509.stderr
index b1f256d2d9e..25b6d8a47d2 100644
--- a/src/test/ui/error-codes/E0509.stderr
+++ b/src/test/ui/error-codes/E0509.stderr
@@ -1,7 +1,7 @@
 error[E0509]: cannot move out of type `DropStruct`, which implements the `Drop` trait
   --> $DIR/E0509.rs:16:23
    |
-LL |     let fancy_field = drop_struct.fancy; //~ ERROR E0509
+LL |     let fancy_field = drop_struct.fancy;
    |                       ^^^^^^^^^^^^^^^^^
    |                       |
    |                       cannot move out of here
diff --git a/src/test/ui/error-codes/E0511.stderr b/src/test/ui/error-codes/E0511.stderr
index f1e3c0135bf..1362a3d1f25 100644
--- a/src/test/ui/error-codes/E0511.stderr
+++ b/src/test/ui/error-codes/E0511.stderr
@@ -1,7 +1,7 @@
 error[E0511]: invalid monomorphization of `simd_add` intrinsic: expected SIMD input type, found non-SIMD `i32`
   --> $DIR/E0511.rs:8:14
    |
-LL |     unsafe { simd_add(0, 1); } //~ ERROR E0511
+LL |     unsafe { simd_add(0, 1); }
    |              ^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0512.stderr b/src/test/ui/error-codes/E0512.stderr
index 998f6403f0b..3fecce542ce 100644
--- a/src/test/ui/error-codes/E0512.stderr
+++ b/src/test/ui/error-codes/E0512.stderr
@@ -1,7 +1,7 @@
 error[E0512]: cannot transmute between types of different sizes, or dependently-sized types
   --> $DIR/E0512.rs:4:23
    |
-LL |     unsafe { takes_u8(::std::mem::transmute(0u16)); } //~ ERROR E0512
+LL |     unsafe { takes_u8(::std::mem::transmute(0u16)); }
    |                       ^^^^^^^^^^^^^^^^^^^^^
    |
    = note: source type: `u16` (16 bits)
diff --git a/src/test/ui/error-codes/E0516.stderr b/src/test/ui/error-codes/E0516.stderr
index 034c1793364..2e6de5053d5 100644
--- a/src/test/ui/error-codes/E0516.stderr
+++ b/src/test/ui/error-codes/E0516.stderr
@@ -1,7 +1,7 @@
 error[E0516]: `typeof` is a reserved keyword but unimplemented
   --> $DIR/E0516.rs:2:12
    |
-LL |     let x: typeof(92) = 92; //~ ERROR E0516
+LL |     let x: typeof(92) = 92;
    |            ^^^^^^^^^^ reserved keyword
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0517.stderr b/src/test/ui/error-codes/E0517.stderr
index 366ab1bca63..e256c07de26 100644
--- a/src/test/ui/error-codes/E0517.stderr
+++ b/src/test/ui/error-codes/E0517.stderr
@@ -1,7 +1,7 @@
 error[E0517]: attribute should be applied to struct, enum or union
   --> $DIR/E0517.rs:1:8
    |
-LL | #[repr(C)] //~ ERROR: E0517
+LL | #[repr(C)]
    |        ^
 LL | type Foo = u8;
    | -------------- not a struct, enum or union
@@ -9,7 +9,7 @@ LL | type Foo = u8;
 error[E0517]: attribute should be applied to struct or union
   --> $DIR/E0517.rs:4:8
    |
-LL | #[repr(packed)] //~ ERROR: E0517
+LL | #[repr(packed)]
    |        ^^^^^^
 LL | enum Foo2 {Bar, Baz}
    | -------------------- not a struct or union
@@ -17,7 +17,7 @@ LL | enum Foo2 {Bar, Baz}
 error[E0517]: attribute should be applied to enum
   --> $DIR/E0517.rs:7:8
    |
-LL | #[repr(u8)] //~ ERROR: E0517
+LL | #[repr(u8)]
    |        ^^
 LL | struct Foo3 {bar: bool, baz: bool}
    | ---------------------------------- not an enum
@@ -25,7 +25,7 @@ LL | struct Foo3 {bar: bool, baz: bool}
 error[E0517]: attribute should be applied to struct, enum or union
   --> $DIR/E0517.rs:10:8
    |
-LL |   #[repr(C)] //~ ERROR: E0517
+LL |   #[repr(C)]
    |          ^
 LL | / impl Foo3 {
 LL | | }
diff --git a/src/test/ui/error-codes/E0518.stderr b/src/test/ui/error-codes/E0518.stderr
index 6391a69c24e..561446f8175 100644
--- a/src/test/ui/error-codes/E0518.stderr
+++ b/src/test/ui/error-codes/E0518.stderr
@@ -1,7 +1,7 @@
 error[E0518]: attribute should be applied to function or closure
   --> $DIR/E0518.rs:1:1
    |
-LL | #[inline(always)] //~ ERROR: E0518
+LL | #[inline(always)]
    | ^^^^^^^^^^^^^^^^^
 LL | struct Foo;
    | ----------- not a function or closure
@@ -9,7 +9,7 @@ LL | struct Foo;
 error[E0518]: attribute should be applied to function or closure
   --> $DIR/E0518.rs:4:1
    |
-LL |   #[inline(never)] //~ ERROR: E0518
+LL |   #[inline(never)]
    |   ^^^^^^^^^^^^^^^^
 LL | / impl Foo {
 LL | | }
diff --git a/src/test/ui/error-codes/E0530.stderr b/src/test/ui/error-codes/E0530.stderr
index 2ef80253eaf..c312144132d 100644
--- a/src/test/ui/error-codes/E0530.stderr
+++ b/src/test/ui/error-codes/E0530.stderr
@@ -4,7 +4,7 @@ error[E0530]: match bindings cannot shadow statics
 LL |     static TEST: i32 = 0;
    |     --------------------- the static `TEST` is defined here
 ...
-LL |         TEST => {} //~ ERROR E0530
+LL |         TEST => {}
    |         ^^^^ cannot be named the same as a static
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0534.stderr b/src/test/ui/error-codes/E0534.stderr
index d2829e1643b..23f9cd7ce2d 100644
--- a/src/test/ui/error-codes/E0534.stderr
+++ b/src/test/ui/error-codes/E0534.stderr
@@ -1,7 +1,7 @@
 error[E0534]: expected one argument
   --> $DIR/E0534.rs:1:1
    |
-LL | #[inline()] //~ ERROR E0534
+LL | #[inline()]
    | ^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0565-1.stderr b/src/test/ui/error-codes/E0565-1.stderr
index c320918a3bf..1283a9c5ef6 100644
--- a/src/test/ui/error-codes/E0565-1.stderr
+++ b/src/test/ui/error-codes/E0565-1.stderr
@@ -1,7 +1,7 @@
 error[E0565]: item in `deprecated` must be a key/value pair
   --> $DIR/E0565-1.rs:2:14
    |
-LL | #[deprecated("since")] //~ ERROR E0565
+LL | #[deprecated("since")]
    |              ^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0565-2.stderr b/src/test/ui/error-codes/E0565-2.stderr
index 8e2ce09059a..bb30bd7befb 100644
--- a/src/test/ui/error-codes/E0565-2.stderr
+++ b/src/test/ui/error-codes/E0565-2.stderr
@@ -1,7 +1,7 @@
 error[E0565]: literal in `deprecated` value must be a string
   --> $DIR/E0565-2.rs:2:22
    |
-LL | #[deprecated(since = b"1.29", note = "hi")] //~ ERROR E0565
+LL | #[deprecated(since = b"1.29", note = "hi")]
    |                      ^^^^^^^ help: consider removing the prefix: `"1.29"`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0565.stderr b/src/test/ui/error-codes/E0565.stderr
index 2c172f81149..6ed90c0ae4f 100644
--- a/src/test/ui/error-codes/E0565.stderr
+++ b/src/test/ui/error-codes/E0565.stderr
@@ -1,7 +1,7 @@
 error[E0565]: meta item in `repr` must be an identifier
   --> $DIR/E0565.rs:2:8
    |
-LL | #[repr("C")] //~ ERROR E0565
+LL | #[repr("C")]
    |        ^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0572.stderr b/src/test/ui/error-codes/E0572.stderr
index 295a518c336..36619f8dee4 100644
--- a/src/test/ui/error-codes/E0572.stderr
+++ b/src/test/ui/error-codes/E0572.stderr
@@ -1,7 +1,7 @@
 error[E0572]: return statement outside of function body
   --> $DIR/E0572.rs:1:18
    |
-LL | const FOO: u32 = return 0; //~ ERROR E0572
+LL | const FOO: u32 = return 0;
    |                  ^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0586.stderr b/src/test/ui/error-codes/E0586.stderr
index 394b4be3340..d1e7e3f4744 100644
--- a/src/test/ui/error-codes/E0586.stderr
+++ b/src/test/ui/error-codes/E0586.stderr
@@ -1,7 +1,7 @@
 error[E0586]: inclusive range with no end
   --> $DIR/E0586.rs:3:22
    |
-LL |     let x = &tmp[1..=]; //~ ERROR E0586
+LL |     let x = &tmp[1..=];
    |                      ^
    |
    = help: inclusive ranges must be bounded at the end (`..=b` or `a..=b`)
diff --git a/src/test/ui/error-codes/E0597.stderr b/src/test/ui/error-codes/E0597.stderr
index a5b0cc49d0c..cab97858531 100644
--- a/src/test/ui/error-codes/E0597.stderr
+++ b/src/test/ui/error-codes/E0597.stderr
@@ -3,7 +3,7 @@ error[E0597]: `y` does not live long enough
    |
 LL |     x.x = Some(&y);
    |                 ^ borrowed value does not live long enough
-LL |     //~^ `y` does not live long enough [E0597]
+LL |
 LL | }
    | - `y` dropped here while still borrowed
    |
diff --git a/src/test/ui/error-codes/E0599.stderr b/src/test/ui/error-codes/E0599.stderr
index 85110889e9a..6fb53e72763 100644
--- a/src/test/ui/error-codes/E0599.stderr
+++ b/src/test/ui/error-codes/E0599.stderr
@@ -4,7 +4,7 @@ error[E0599]: no associated item named `NotEvenReal` found for type `Foo` in the
 LL | struct Foo;
    | ----------- associated item `NotEvenReal` not found for this
 ...
-LL |     || if let Foo::NotEvenReal() = Foo {}; //~ ERROR E0599
+LL |     || if let Foo::NotEvenReal() = Foo {};
    |               -----^^^^^^^^^^^-- associated item not found in `Foo`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0600.stderr b/src/test/ui/error-codes/E0600.stderr
index 6c6d922290f..95ac4510ca8 100644
--- a/src/test/ui/error-codes/E0600.stderr
+++ b/src/test/ui/error-codes/E0600.stderr
@@ -1,7 +1,7 @@
 error[E0600]: cannot apply unary operator `!` to type `&'static str`
   --> $DIR/E0600.rs:2:5
    |
-LL |     !"a"; //~ ERROR E0600
+LL |     !"a";
    |     ^^^^ cannot apply unary operator `!`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0603.stderr b/src/test/ui/error-codes/E0603.stderr
index ee8fd2809bc..444005e086f 100644
--- a/src/test/ui/error-codes/E0603.stderr
+++ b/src/test/ui/error-codes/E0603.stderr
@@ -1,7 +1,7 @@
 error[E0603]: constant `PRIVATE` is private
   --> $DIR/E0603.rs:6:17
    |
-LL |     SomeModule::PRIVATE; //~ ERROR E0603
+LL |     SomeModule::PRIVATE;
    |                 ^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0604.stderr b/src/test/ui/error-codes/E0604.stderr
index 2bd92db86e3..5861bdcb7a9 100644
--- a/src/test/ui/error-codes/E0604.stderr
+++ b/src/test/ui/error-codes/E0604.stderr
@@ -1,7 +1,7 @@
 error[E0604]: only `u8` can be cast as `char`, not `u32`
   --> $DIR/E0604.rs:2:5
    |
-LL |     1u32 as char; //~ ERROR E0604
+LL |     1u32 as char;
    |     ^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0605.stderr b/src/test/ui/error-codes/E0605.stderr
index 4dc074b222a..95e899db8b7 100644
--- a/src/test/ui/error-codes/E0605.stderr
+++ b/src/test/ui/error-codes/E0605.stderr
@@ -1,7 +1,7 @@
 error[E0605]: non-primitive cast: `u8` as `std::vec::Vec<u8>`
   --> $DIR/E0605.rs:3:5
    |
-LL |     x as Vec<u8>; //~ ERROR E0605
+LL |     x as Vec<u8>;
    |     ^^^^^^^^^^^^
    |
    = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait
@@ -9,7 +9,7 @@ LL |     x as Vec<u8>; //~ ERROR E0605
 error[E0605]: non-primitive cast: `*const u8` as `&u8`
   --> $DIR/E0605.rs:6:5
    |
-LL |     v as &u8; //~ ERROR E0605
+LL |     v as &u8;
    |     ^^^^^^^^
    |
    = note: an `as` expression can only be used to convert between primitive types. Consider using the `From` trait
diff --git a/src/test/ui/error-codes/E0606.stderr b/src/test/ui/error-codes/E0606.stderr
index 89ec4896a2b..fce24886eb0 100644
--- a/src/test/ui/error-codes/E0606.stderr
+++ b/src/test/ui/error-codes/E0606.stderr
@@ -1,7 +1,7 @@
 error[E0606]: casting `&u8` as `u8` is invalid
   --> $DIR/E0606.rs:2:5
    |
-LL |     &0u8 as u8; //~ ERROR E0606
+LL |     &0u8 as u8;
    |     ----^^^^^^
    |     |
    |     cannot cast `&u8` as `u8`
diff --git a/src/test/ui/error-codes/E0607.stderr b/src/test/ui/error-codes/E0607.stderr
index 1fbe4b9c5bc..a0fe02c1c4d 100644
--- a/src/test/ui/error-codes/E0607.stderr
+++ b/src/test/ui/error-codes/E0607.stderr
@@ -1,7 +1,7 @@
 error[E0607]: cannot cast thin pointer `*const u8` to fat pointer `*const [u8]`
   --> $DIR/E0607.rs:3:5
    |
-LL |     v as *const [u8]; //~ ERROR E0607
+LL |     v as *const [u8];
    |     ^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0608.stderr b/src/test/ui/error-codes/E0608.stderr
index b228b2eddfd..3aec509934b 100644
--- a/src/test/ui/error-codes/E0608.stderr
+++ b/src/test/ui/error-codes/E0608.stderr
@@ -1,7 +1,7 @@
 error[E0608]: cannot index into a value of type `u8`
   --> $DIR/E0608.rs:2:5
    |
-LL |     0u8[2]; //~ ERROR E0608
+LL |     0u8[2];
    |     ^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0609.stderr b/src/test/ui/error-codes/E0609.stderr
index b5cf09b2201..797e95d02dd 100644
--- a/src/test/ui/error-codes/E0609.stderr
+++ b/src/test/ui/error-codes/E0609.stderr
@@ -1,7 +1,7 @@
 error[E0609]: no field `foo` on type `Foo`
   --> $DIR/E0609.rs:8:15
    |
-LL |     let _ = x.foo; //~ ERROR E0609
+LL |     let _ = x.foo;
    |               ^^^ unknown field
    |
    = note: available fields are: `x`
@@ -9,7 +9,7 @@ LL |     let _ = x.foo; //~ ERROR E0609
 error[E0609]: no field `1` on type `Bar`
   --> $DIR/E0609.rs:11:7
    |
-LL |     y.1; //~ ERROR E0609
+LL |     y.1;
    |       ^ unknown field
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/error-codes/E0610.stderr b/src/test/ui/error-codes/E0610.stderr
index c46b1f2b2d5..a2966eea44c 100644
--- a/src/test/ui/error-codes/E0610.stderr
+++ b/src/test/ui/error-codes/E0610.stderr
@@ -1,7 +1,7 @@
 error[E0610]: `{integer}` is a primitive type and therefore doesn't have fields
   --> $DIR/E0610.rs:3:15
    |
-LL |     let _ = x.foo; //~ ERROR E0610
+LL |     let _ = x.foo;
    |               ^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0614.stderr b/src/test/ui/error-codes/E0614.stderr
index 5b1a4a93c4c..598117c2b60 100644
--- a/src/test/ui/error-codes/E0614.stderr
+++ b/src/test/ui/error-codes/E0614.stderr
@@ -1,7 +1,7 @@
 error[E0614]: type `u32` cannot be dereferenced
   --> $DIR/E0614.rs:3:5
    |
-LL |     *y; //~ ERROR E0614
+LL |     *y;
    |     ^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0615.stderr b/src/test/ui/error-codes/E0615.stderr
index d86ee5b9b4b..772058719ae 100644
--- a/src/test/ui/error-codes/E0615.stderr
+++ b/src/test/ui/error-codes/E0615.stderr
@@ -1,7 +1,7 @@
 error[E0615]: attempted to take value of method `method` on type `Foo`
   --> $DIR/E0615.rs:11:7
    |
-LL |     f.method; //~ ERROR E0615
+LL |     f.method;
    |       ^^^^^^ help: use parentheses to call the method: `method()`
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0616.stderr b/src/test/ui/error-codes/E0616.stderr
index f600bfa8cd3..556e5db10a9 100644
--- a/src/test/ui/error-codes/E0616.stderr
+++ b/src/test/ui/error-codes/E0616.stderr
@@ -1,7 +1,7 @@
 error[E0616]: field `x` of struct `a::Foo` is private
   --> $DIR/E0616.rs:13:5
    |
-LL |     f.x; //~ ERROR E0616
+LL |     f.x;
    |     ^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0620.stderr b/src/test/ui/error-codes/E0620.stderr
index f7319a878c2..65152b2b74d 100644
--- a/src/test/ui/error-codes/E0620.stderr
+++ b/src/test/ui/error-codes/E0620.stderr
@@ -1,13 +1,13 @@
 error[E0620]: cast to unsized type: `&[usize; 2]` as `[usize]`
   --> $DIR/E0620.rs:2:16
    |
-LL |     let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620
+LL |     let _foo = &[1_usize, 2] as [usize];
    |                ^^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: consider using an implicit coercion to `&[usize]` instead
   --> $DIR/E0620.rs:2:16
    |
-LL |     let _foo = &[1_usize, 2] as [usize]; //~ ERROR E0620
+LL |     let _foo = &[1_usize, 2] as [usize];
    |                ^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
index f763c82eff8..feca7f10b70 100644
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
+++ b/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
@@ -1,28 +1,28 @@
 error[E0495]: cannot infer an appropriate lifetime for lifetime parameter `'a` due to conflicting requirements
   --> $DIR/E0621-does-not-trigger-for-closures.rs:15:5
    |
-LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
+LL |     invoke(&x, |a, b| if a > b { a } else { b });
    |     ^^^^^^
    |
 note: first, the lifetime cannot outlive the anonymous lifetime #2 defined on the body at 15:16...
   --> $DIR/E0621-does-not-trigger-for-closures.rs:15:16
    |
-LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
+LL |     invoke(&x, |a, b| if a > b { a } else { b });
    |                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...so that reference does not outlive borrowed content
   --> $DIR/E0621-does-not-trigger-for-closures.rs:15:45
    |
-LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
+LL |     invoke(&x, |a, b| if a > b { a } else { b });
    |                                             ^
 note: but, the lifetime must be valid for the call at 15:5...
   --> $DIR/E0621-does-not-trigger-for-closures.rs:15:5
    |
-LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
+LL |     invoke(&x, |a, b| if a > b { a } else { b });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 note: ...so type `&i32` of expression is valid during the expression
   --> $DIR/E0621-does-not-trigger-for-closures.rs:15:5
    |
-LL |     invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
+LL |     invoke(&x, |a, b| if a > b { a } else { b });
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0624.stderr b/src/test/ui/error-codes/E0624.stderr
index 31a2f607e58..01ac24cfbbe 100644
--- a/src/test/ui/error-codes/E0624.stderr
+++ b/src/test/ui/error-codes/E0624.stderr
@@ -1,7 +1,7 @@
 error[E0624]: method `method` is private
   --> $DIR/E0624.rs:11:9
    |
-LL |     foo.method(); //~ ERROR method `method` is private [E0624]
+LL |     foo.method();
    |         ^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0637.stderr b/src/test/ui/error-codes/E0637.stderr
index f744520ef6e..d19ebfd15a5 100644
--- a/src/test/ui/error-codes/E0637.stderr
+++ b/src/test/ui/error-codes/E0637.stderr
@@ -1,19 +1,19 @@
 error[E0637]: `'_` cannot be used here
   --> $DIR/E0637.rs:1:16
    |
-LL | struct Foo<'a: '_>(&'a u8); //~ ERROR cannot be used here
+LL | struct Foo<'a: '_>(&'a u8);
    |                ^^ `'_` is a reserved lifetime name
 
 error[E0637]: `'_` cannot be used here
   --> $DIR/E0637.rs:2:12
    |
-LL | fn foo<'a: '_>(_: &'a u8) {} //~ ERROR cannot be used here
+LL | fn foo<'a: '_>(_: &'a u8) {}
    |            ^^ `'_` is a reserved lifetime name
 
 error[E0637]: `'_` cannot be used here
   --> $DIR/E0637.rs:5:10
    |
-LL | impl<'a: '_> Bar<'a> { //~ ERROR cannot be used here
+LL | impl<'a: '_> Bar<'a> {
    |          ^^ `'_` is a reserved lifetime name
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/error-codes/E0646.stderr b/src/test/ui/error-codes/E0646.stderr
index 502200c1d00..976cdd45f57 100644
--- a/src/test/ui/error-codes/E0646.stderr
+++ b/src/test/ui/error-codes/E0646.stderr
@@ -1,7 +1,7 @@
 error[E0646]: `main` function is not allowed to have a `where` clause
   --> $DIR/E0646.rs:1:17
    |
-LL | fn main() where (): Copy {} //~ ERROR [E0646]
+LL | fn main() where (): Copy {}
    |                 ^^^^^^^^ `main` cannot have a `where` clause
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0647.stderr b/src/test/ui/error-codes/E0647.stderr
index da9ba5bf34b..465cc7702ee 100644
--- a/src/test/ui/error-codes/E0647.stderr
+++ b/src/test/ui/error-codes/E0647.stderr
@@ -1,7 +1,7 @@
 error[E0647]: start function is not allowed to have a `where` clause
   --> $DIR/E0647.rs:7:56
    |
-LL | fn start(_: isize, _: *const *const u8) -> isize where (): Copy { //~ ERROR [E0647]
+LL | fn start(_: isize, _: *const *const u8) -> isize where (): Copy {
    |                                                        ^^^^^^^^ start function cannot have a `where` clause
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0648.stderr b/src/test/ui/error-codes/E0648.stderr
index 090157fb0d7..f682b4f41e5 100644
--- a/src/test/ui/error-codes/E0648.stderr
+++ b/src/test/ui/error-codes/E0648.stderr
@@ -1,7 +1,7 @@
 error[E0648]: `export_name` may not contain null characters
   --> $DIR/E0648.rs:1:1
    |
-LL | #[export_name="/0foo"] //~ ERROR E0648
+LL | #[export_name="/0foo"]
    | ^^^^^^^^^^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/E0658.stderr b/src/test/ui/error-codes/E0658.stderr
index 58802b23db3..292c49fa84e 100644
--- a/src/test/ui/error-codes/E0658.stderr
+++ b/src/test/ui/error-codes/E0658.stderr
@@ -1,7 +1,7 @@
 error[E0658]: repr with 128-bit type is unstable (see issue #35118)
   --> $DIR/E0658.rs:2:1
    |
-LL | / enum Foo { //~ ERROR E0658
+LL | / enum Foo {
 LL | |     Bar(u64),
 LL | | }
    | |_^
diff --git a/src/test/ui/error-codes/E0659.stderr b/src/test/ui/error-codes/E0659.stderr
index b5aa1b21b09..2f01f54c2d1 100644
--- a/src/test/ui/error-codes/E0659.stderr
+++ b/src/test/ui/error-codes/E0659.stderr
@@ -1,7 +1,7 @@
 error[E0659]: `foo` is ambiguous (glob import vs glob import in the same module)
   --> $DIR/E0659.rs:15:15
    |
-LL |     collider::foo(); //~ ERROR E0659
+LL |     collider::foo();
    |               ^^^ ambiguous name
    |
 note: `foo` could refer to the function imported here
diff --git a/src/test/ui/error-codes/E0718.stderr b/src/test/ui/error-codes/E0718.stderr
index 4f9734d1acf..412c856ce06 100644
--- a/src/test/ui/error-codes/E0718.stderr
+++ b/src/test/ui/error-codes/E0718.stderr
@@ -1,7 +1,7 @@
 error[E0718]: `arc` language item must be applied to a struct
   --> $DIR/E0718.rs:4:1
    |
-LL | #[lang = "arc"] //~ ERROR language item must be applied to a struct
+LL | #[lang = "arc"]
    | ^^^^^^^^^^^^^^^ attribute should be applied to a struct, not a static item
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/ex-E0611.stderr b/src/test/ui/error-codes/ex-E0611.stderr
index f8c7cd8c146..8bd00a392d4 100644
--- a/src/test/ui/error-codes/ex-E0611.stderr
+++ b/src/test/ui/error-codes/ex-E0611.stderr
@@ -1,7 +1,7 @@
 error[E0616]: field `0` of struct `a::Foo` is private
   --> $DIR/ex-E0611.rs:11:4
    |
-LL |    y.0; //~ ERROR field `0` of struct `a::Foo` is private
+LL |    y.0;
    |    ^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/error-codes/ex-E0612.stderr b/src/test/ui/error-codes/ex-E0612.stderr
index 0f498d16439..b21b6fdfcf1 100644
--- a/src/test/ui/error-codes/ex-E0612.stderr
+++ b/src/test/ui/error-codes/ex-E0612.stderr
@@ -1,7 +1,7 @@
 error[E0609]: no field `1` on type `Foo`
   --> $DIR/ex-E0612.rs:5:6
    |
-LL |    y.1; //~ ERROR no field `1` on type `Foo`
+LL |    y.1;
    |      ^ help: a field with a similar name exists: `0`
 
 error: aborting due to previous error