about summary refs log tree commit diff
path: root/src/test/ui/span
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/span
parent2060d49c39e41a286b0425cb2f7ba6022a2d4b96 (diff)
downloadrust-fa72a81bea27f1fda4287475e4cc2f684c971e7f.tar.gz
rust-fa72a81bea27f1fda4287475e4cc2f684c971e7f.zip
Update tests
Diffstat (limited to 'src/test/ui/span')
-rw-r--r--src/test/ui/span/E0057.stderr4
-rw-r--r--src/test/ui/span/E0072.stderr2
-rw-r--r--src/test/ui/span/E0204.stderr8
-rw-r--r--src/test/ui/span/E0535.stderr2
-rw-r--r--src/test/ui/span/E0536.stderr2
-rw-r--r--src/test/ui/span/E0537.stderr2
-rw-r--r--src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr20
-rw-r--r--src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr8
-rw-r--r--src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr2
-rw-r--r--src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr2
-rw-r--r--src/test/ui/span/borrowck-object-mutability.stderr4
-rw-r--r--src/test/ui/span/destructor-restrictions.stderr2
-rw-r--r--src/test/ui/span/dropck_arr_cycle_checked.stderr2
-rw-r--r--src/test/ui/span/dropck_direct_cycle_with_drop.stderr2
-rw-r--r--src/test/ui/span/dropck_vec_cycle_checked.stderr2
-rw-r--r--src/test/ui/span/gated-features-attr-spans.stderr2
-rw-r--r--src/test/ui/span/import-ty-params.stderr4
-rw-r--r--src/test/ui/span/issue-11925.stderr2
-rw-r--r--src/test/ui/span/issue-24690.stderr6
-rw-r--r--src/test/ui/span/issue-25199.stderr2
-rw-r--r--src/test/ui/span/issue-27522.stderr2
-rw-r--r--src/test/ui/span/issue-29595.stderr2
-rw-r--r--src/test/ui/span/issue-34264.stderr16
-rw-r--r--src/test/ui/span/issue-36530.stderr6
-rw-r--r--src/test/ui/span/issue-37767.stderr6
-rw-r--r--src/test/ui/span/issue-42234-unknown-receiver-type.stderr2
-rw-r--r--src/test/ui/span/issue28498-reject-ex1.stderr2
-rw-r--r--src/test/ui/span/lint-unused-unsafe.stderr18
-rw-r--r--src/test/ui/span/macro-span-replacement.stderr2
-rw-r--r--src/test/ui/span/macro-ty-params.stderr8
-rw-r--r--src/test/ui/span/missing-unit-argument.stderr20
-rw-r--r--src/test/ui/span/move-closure.stderr2
-rw-r--r--src/test/ui/span/multiline-span-E0072.stderr2
-rw-r--r--src/test/ui/span/multiline-span-simple.stderr2
-rw-r--r--src/test/ui/span/mut-arg-hint.stderr6
-rw-r--r--src/test/ui/span/non-existing-module-import.stderr2
-rw-r--r--src/test/ui/span/pub-struct-field.stderr6
-rw-r--r--src/test/ui/span/recursive-type-field.stderr4
-rw-r--r--src/test/ui/span/regions-escape-loop-via-variable.stderr2
-rw-r--r--src/test/ui/span/regions-escape-loop-via-vec.stderr8
-rw-r--r--src/test/ui/span/send-is-not-static-std-sync.stderr6
-rw-r--r--src/test/ui/span/suggestion-non-ascii.stderr2
-rw-r--r--src/test/ui/span/typo-suggestion.stderr4
-rw-r--r--src/test/ui/span/unused-warning-point-at-signature.stderr8
-rw-r--r--src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr2
-rw-r--r--src/test/ui/span/visibility-ty-params.stderr6
46 files changed, 113 insertions, 113 deletions
diff --git a/src/test/ui/span/E0057.stderr b/src/test/ui/span/E0057.stderr
index 5906a05c32c..6b5890cac36 100644
--- a/src/test/ui/span/E0057.stderr
+++ b/src/test/ui/span/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/span/E0072.stderr b/src/test/ui/span/E0072.stderr
index 4cb9eb30802..d4a5e7400d2 100644
--- a/src/test/ui/span/E0072.stderr
+++ b/src/test/ui/span/E0072.stderr
@@ -1,7 +1,7 @@
 error[E0072]: recursive type `ListNode` has infinite size
   --> $DIR/E0072.rs:1:1
    |
-LL | struct ListNode { //~ ERROR has infinite size
+LL | struct ListNode {
    | ^^^^^^^^^^^^^^^ recursive type has infinite size
 LL |     head: u8,
 LL |     tail: Option<ListNode>,
diff --git a/src/test/ui/span/E0204.stderr b/src/test/ui/span/E0204.stderr
index acb7cd2a557..5a981a4a6e4 100644
--- a/src/test/ui/span/E0204.stderr
+++ b/src/test/ui/span/E0204.stderr
@@ -4,13 +4,13 @@ error[E0204]: the trait `Copy` may not be implemented for this type
 LL |     foo: Vec<u32>,
    |     ------------- this field does not implement `Copy`
 ...
-LL | impl Copy for Foo { } //~ ERROR may not be implemented for this type
+LL | impl Copy for Foo { }
    |      ^^^^
 
 error[E0204]: the trait `Copy` may not be implemented for this type
   --> $DIR/E0204.rs:7:10
    |
-LL | #[derive(Copy)] //~ ERROR may not be implemented for this type
+LL | #[derive(Copy)]
    |          ^^^^
 LL | struct Foo2<'a> {
 LL |     ty: &'a mut bool,
@@ -22,13 +22,13 @@ error[E0204]: the trait `Copy` may not be implemented for this type
 LL |     Bar { x: Vec<u32> },
    |           ----------- this field does not implement `Copy`
 ...
-LL | impl Copy for EFoo { } //~ ERROR may not be implemented for this type
+LL | impl Copy for EFoo { }
    |      ^^^^
 
 error[E0204]: the trait `Copy` may not be implemented for this type
   --> $DIR/E0204.rs:19:10
    |
-LL | #[derive(Copy)] //~ ERROR may not be implemented for this type
+LL | #[derive(Copy)]
    |          ^^^^
 LL | enum EFoo2<'a> {
 LL |     Bar(&'a mut bool),
diff --git a/src/test/ui/span/E0535.stderr b/src/test/ui/span/E0535.stderr
index 8502776eb16..f52c3f9f2c0 100644
--- a/src/test/ui/span/E0535.stderr
+++ b/src/test/ui/span/E0535.stderr
@@ -1,7 +1,7 @@
 error[E0535]: invalid argument
   --> $DIR/E0535.rs:1:10
    |
-LL | #[inline(unknown)] //~ ERROR E0535
+LL | #[inline(unknown)]
    |          ^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/span/E0536.stderr b/src/test/ui/span/E0536.stderr
index 18e2104f7ad..820b0d7441b 100644
--- a/src/test/ui/span/E0536.stderr
+++ b/src/test/ui/span/E0536.stderr
@@ -1,7 +1,7 @@
 error[E0536]: expected 1 cfg-pattern
   --> $DIR/E0536.rs:1:7
    |
-LL | #[cfg(not())] //~ ERROR E0536
+LL | #[cfg(not())]
    |       ^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/span/E0537.stderr b/src/test/ui/span/E0537.stderr
index 53e8637ea30..5478c3fbcdd 100644
--- a/src/test/ui/span/E0537.stderr
+++ b/src/test/ui/span/E0537.stderr
@@ -1,7 +1,7 @@
 error[E0537]: invalid predicate `unknown`
   --> $DIR/E0537.rs:1:7
    |
-LL | #[cfg(unknown())] //~ ERROR E0537
+LL | #[cfg(unknown())]
    |       ^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
index e0524be6b0c..63baa7c8cb5 100644
--- a/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
+++ b/src/test/ui/span/borrowck-borrow-overloaded-auto-deref-mut.stderr
@@ -3,7 +3,7 @@ error[E0596]: cannot borrow immutable argument `x` as mutable
    |
 LL | fn deref_mut_field1(x: Own<Point>) {
    |                     - help: make this binding mutable: `mut x`
-LL |     let __isize = &mut x.y; //~ ERROR cannot borrow
+LL |     let __isize = &mut x.y;
    |                        ^ cannot borrow mutably
 
 error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
@@ -11,7 +11,7 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
    |
 LL | fn deref_extend_mut_field1(x: &Own<Point>) -> &mut isize {
    |                               ----------- use `&mut Own<Point>` here to make mutable
-LL |     &mut x.y //~ ERROR cannot borrow
+LL |     &mut x.y
    |          ^ cannot borrow as mutable
 
 error[E0499]: cannot borrow `*x` as mutable more than once at a time
@@ -19,7 +19,7 @@ error[E0499]: cannot borrow `*x` as mutable more than once at a time
    |
 LL |     let _x = &mut x.x;
    |                   - first mutable borrow occurs here
-LL |     let _y = &mut x.y; //~ ERROR cannot borrow
+LL |     let _y = &mut x.y;
    |                   ^ second mutable borrow occurs here
 LL |     use_mut(_x);
 LL | }
@@ -30,7 +30,7 @@ error[E0596]: cannot borrow immutable argument `x` as mutable
    |
 LL | fn assign_field1<'a>(x: Own<Point>) {
    |                      - help: make this binding mutable: `mut x`
-LL |     x.y = 3; //~ ERROR cannot borrow
+LL |     x.y = 3;
    |     ^ cannot borrow mutably
 
 error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
@@ -38,7 +38,7 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
    |
 LL | fn assign_field2<'a>(x: &'a Own<Point>) {
    |                         -------------- use `&'a mut Own<Point>` here to make mutable
-LL |     x.y = 3; //~ ERROR cannot borrow
+LL |     x.y = 3;
    |     ^ cannot borrow as mutable
 
 error[E0499]: cannot borrow `*x` as mutable more than once at a time
@@ -46,7 +46,7 @@ error[E0499]: cannot borrow `*x` as mutable more than once at a time
    |
 LL |     let _p: &mut Point = &mut **x;
    |                                -- first mutable borrow occurs here
-LL |     x.y = 3; //~ ERROR cannot borrow
+LL |     x.y = 3;
    |     ^ second mutable borrow occurs here
 LL |     use_mut(_p);
 LL | }
@@ -57,7 +57,7 @@ error[E0596]: cannot borrow immutable argument `x` as mutable
    |
 LL | fn deref_mut_method1(x: Own<Point>) {
    |                      - help: make this binding mutable: `mut x`
-LL |     x.set(0, 0); //~ ERROR cannot borrow
+LL |     x.set(0, 0);
    |     ^ cannot borrow mutably
 
 error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
@@ -65,7 +65,7 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
    |
 LL | fn deref_extend_mut_method1(x: &Own<Point>) -> &mut isize {
    |                                ----------- use `&mut Own<Point>` here to make mutable
-LL |     x.y_mut() //~ ERROR cannot borrow
+LL |     x.y_mut()
    |     ^ cannot borrow as mutable
 
 error[E0596]: cannot borrow immutable argument `x` as mutable
@@ -73,7 +73,7 @@ error[E0596]: cannot borrow immutable argument `x` as mutable
    |
 LL | fn assign_method1<'a>(x: Own<Point>) {
    |                       - help: make this binding mutable: `mut x`
-LL |     *x.y_mut() = 3; //~ ERROR cannot borrow
+LL |     *x.y_mut() = 3;
    |      ^ cannot borrow mutably
 
 error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
@@ -81,7 +81,7 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
    |
 LL | fn assign_method2<'a>(x: &'a Own<Point>) {
    |                          -------------- use `&'a mut Own<Point>` here to make mutable
-LL |     *x.y_mut() = 3; //~ ERROR cannot borrow
+LL |     *x.y_mut() = 3;
    |      ^ cannot borrow as mutable
 
 error: aborting due to 10 previous errors
diff --git a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr b/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
index 46d11065a86..77f3982b2b4 100644
--- a/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
+++ b/src/test/ui/span/borrowck-borrow-overloaded-deref-mut.stderr
@@ -3,7 +3,7 @@ error[E0596]: cannot borrow immutable argument `x` as mutable
    |
 LL | fn deref_mut1(x: Own<isize>) {
    |               - help: make this binding mutable: `mut x`
-LL |     let __isize = &mut *x; //~ ERROR cannot borrow
+LL |     let __isize = &mut *x;
    |                         ^ cannot borrow mutably
 
 error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
@@ -11,7 +11,7 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
    |
 LL | fn deref_extend_mut1<'a>(x: &'a Own<isize>) -> &'a mut isize {
    |                             -------------- use `&'a mut Own<isize>` here to make mutable
-LL |     &mut **x //~ ERROR cannot borrow
+LL |     &mut **x
    |           ^^ cannot borrow as mutable
 
 error[E0596]: cannot borrow immutable argument `x` as mutable
@@ -19,7 +19,7 @@ error[E0596]: cannot borrow immutable argument `x` as mutable
    |
 LL | fn assign1<'a>(x: Own<isize>) {
    |                - help: make this binding mutable: `mut x`
-LL |     *x = 3; //~ ERROR cannot borrow
+LL |     *x = 3;
    |      ^ cannot borrow mutably
 
 error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
@@ -27,7 +27,7 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
    |
 LL | fn assign2<'a>(x: &'a Own<isize>) {
    |                   -------------- use `&'a mut Own<isize>` here to make mutable
-LL |     **x = 3; //~ ERROR cannot borrow
+LL |     **x = 3;
    |      ^^ cannot borrow as mutable
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
index d81d402fce7..6c8f477e310 100644
--- a/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
+++ b/src/test/ui/span/borrowck-call-is-borrow-issue-12224.stderr
@@ -5,7 +5,7 @@ LL |     f(Box::new(|| {
    |     -          ^^ second mutable borrow occurs here
    |     |
    |     first mutable borrow occurs here
-LL |     //~^ ERROR: cannot borrow `f` as mutable more than once
+LL |
 LL |         f((Box::new(|| {})))
    |         - borrow occurs due to use of `f` in closure
 LL |     }));
diff --git a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr
index 4875e27ef45..440c5c9c7c9 100644
--- a/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr
+++ b/src/test/ui/span/borrowck-call-method-from-mut-aliasable.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
 LL | fn b(x: &Foo) {
    |         ---- use `&mut Foo` here to make mutable
 LL |     x.f();
-LL |     x.h(); //~ ERROR cannot borrow
+LL |     x.h();
    |     ^ cannot borrow as mutable
 
 error: aborting due to previous error
diff --git a/src/test/ui/span/borrowck-object-mutability.stderr b/src/test/ui/span/borrowck-object-mutability.stderr
index e846331dc0b..073a70e3610 100644
--- a/src/test/ui/span/borrowck-object-mutability.stderr
+++ b/src/test/ui/span/borrowck-object-mutability.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow immutable borrowed content `*x` as mutable
 LL | fn borrowed_receiver(x: &Foo) {
    |                         ---- use `&mut Foo` here to make mutable
 LL |     x.borrowed();
-LL |     x.borrowed_mut(); //~ ERROR cannot borrow
+LL |     x.borrowed_mut();
    |     ^ cannot borrow as mutable
 
 error[E0596]: cannot borrow immutable `Box` content `*x` as mutable
@@ -13,7 +13,7 @@ error[E0596]: cannot borrow immutable `Box` content `*x` as mutable
 LL | fn owned_receiver(x: Box<Foo>) {
    |                   - help: make this binding mutable: `mut x`
 LL |     x.borrowed();
-LL |     x.borrowed_mut(); //~ ERROR cannot borrow
+LL |     x.borrowed_mut();
    |     ^ cannot borrow as mutable
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/span/destructor-restrictions.stderr b/src/test/ui/span/destructor-restrictions.stderr
index 8fec8774678..a82e24b9391 100644
--- a/src/test/ui/span/destructor-restrictions.stderr
+++ b/src/test/ui/span/destructor-restrictions.stderr
@@ -3,7 +3,7 @@ error[E0597]: `*a` does not live long enough
    |
 LL |         *a.borrow() + 1
    |          ^ borrowed value does not live long enough
-LL |     }; //~^ ERROR `*a` does not live long enough
+LL |     };
    |     -- borrowed value needs to live until here
    |     |
    |     `*a` dropped here while still borrowed
diff --git a/src/test/ui/span/dropck_arr_cycle_checked.stderr b/src/test/ui/span/dropck_arr_cycle_checked.stderr
index aae71799e30..b2bacc7f678 100644
--- a/src/test/ui/span/dropck_arr_cycle_checked.stderr
+++ b/src/test/ui/span/dropck_arr_cycle_checked.stderr
@@ -58,7 +58,7 @@ error[E0597]: `b2` does not live long enough
    |
 LL |     b3.a[1].v.set(Some(&b2));
    |                         ^^ borrowed value does not live long enough
-LL |     //~^ ERROR `b2` does not live long enough
+LL |
 LL | }
    | - `b2` dropped here while still borrowed
    |
diff --git a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr b/src/test/ui/span/dropck_direct_cycle_with_drop.stderr
index bc4b517c51d..497924208ab 100644
--- a/src/test/ui/span/dropck_direct_cycle_with_drop.stderr
+++ b/src/test/ui/span/dropck_direct_cycle_with_drop.stderr
@@ -14,7 +14,7 @@ error[E0597]: `d1` does not live long enough
    |
 LL |     d2.p.set(Some(&d1));
    |                    ^^ borrowed value does not live long enough
-LL |     //~^ ERROR `d1` does not live long enough
+LL |
 LL | }
    | - `d1` dropped here while still borrowed
    |
diff --git a/src/test/ui/span/dropck_vec_cycle_checked.stderr b/src/test/ui/span/dropck_vec_cycle_checked.stderr
index 35e4314d0c6..7f902388fac 100644
--- a/src/test/ui/span/dropck_vec_cycle_checked.stderr
+++ b/src/test/ui/span/dropck_vec_cycle_checked.stderr
@@ -58,7 +58,7 @@ error[E0597]: `c2` does not live long enough
    |
 LL |     c3.v[1].v.set(Some(&c2));
    |                         ^^ borrowed value does not live long enough
-LL |     //~^ ERROR `c2` does not live long enough
+LL |
 LL | }
    | - `c2` dropped here while still borrowed
    |
diff --git a/src/test/ui/span/gated-features-attr-spans.stderr b/src/test/ui/span/gated-features-attr-spans.stderr
index 9c4c12ba076..45d14f32f96 100644
--- a/src/test/ui/span/gated-features-attr-spans.stderr
+++ b/src/test/ui/span/gated-features-attr-spans.stderr
@@ -1,7 +1,7 @@
 error[E0658]: SIMD types are experimental and possibly buggy (see issue #27731)
   --> $DIR/gated-features-attr-spans.rs:1:1
    |
-LL | #[repr(simd)] //~ ERROR are experimental
+LL | #[repr(simd)]
    | ^^^^^^^^^^^^^
    |
    = help: add #![feature(repr_simd)] to the crate attributes to enable
diff --git a/src/test/ui/span/import-ty-params.stderr b/src/test/ui/span/import-ty-params.stderr
index cff71bf2e62..a02a1edc134 100644
--- a/src/test/ui/span/import-ty-params.stderr
+++ b/src/test/ui/span/import-ty-params.stderr
@@ -1,13 +1,13 @@
 error: unexpected generic arguments in path
   --> $DIR/import-ty-params.rs:14:15
    |
-LL |     import! { a::b::c::S<u8> } //~ ERROR unexpected generic arguments in path
+LL |     import! { a::b::c::S<u8> }
    |               ^^^^^^^^^^^^^^
 
 error: unexpected generic arguments in path
   --> $DIR/import-ty-params.rs:17:15
    |
-LL |     import! { a::b::c::S<> } //~ ERROR unexpected generic arguments in path
+LL |     import! { a::b::c::S<> }
    |               ^^^^^^^^^^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/span/issue-11925.stderr b/src/test/ui/span/issue-11925.stderr
index 46e2a41b3c3..c75022261a8 100644
--- a/src/test/ui/span/issue-11925.stderr
+++ b/src/test/ui/span/issue-11925.stderr
@@ -1,7 +1,7 @@
 error[E0597]: `x` does not live long enough
   --> $DIR/issue-11925.rs:8:36
    |
-LL |         let f = to_fn_once(move|| &x); //~ ERROR does not live long enough
+LL |         let f = to_fn_once(move|| &x);
    |                                    ^
    |                                    |
    |                                    borrowed value does not live long enough
diff --git a/src/test/ui/span/issue-24690.stderr b/src/test/ui/span/issue-24690.stderr
index 964e323b83e..0864497911d 100644
--- a/src/test/ui/span/issue-24690.stderr
+++ b/src/test/ui/span/issue-24690.stderr
@@ -1,7 +1,7 @@
 warning: unused variable: `theOtherTwo`
   --> $DIR/issue-24690.rs:13:9
    |
-LL |     let theOtherTwo = 2; //~ WARN should have a snake case name
+LL |     let theOtherTwo = 2;
    |         ^^^^^^^^^^^ help: consider prefixing with an underscore: `_theOtherTwo`
    |
 note: lint level defined here
@@ -14,7 +14,7 @@ LL | #![warn(unused)]
 warning: variable `theTwo` should have a snake case name
   --> $DIR/issue-24690.rs:12:9
    |
-LL |     let theTwo = 2; //~ WARN should have a snake case name
+LL |     let theTwo = 2;
    |         ^^^^^^ help: convert the identifier to snake case: `the_two`
    |
    = note: #[warn(non_snake_case)] on by default
@@ -22,6 +22,6 @@ LL |     let theTwo = 2; //~ WARN should have a snake case name
 warning: variable `theOtherTwo` should have a snake case name
   --> $DIR/issue-24690.rs:13:9
    |
-LL |     let theOtherTwo = 2; //~ WARN should have a snake case name
+LL |     let theOtherTwo = 2;
    |         ^^^^^^^^^^^ help: convert the identifier to snake case: `the_other_two`
 
diff --git a/src/test/ui/span/issue-25199.stderr b/src/test/ui/span/issue-25199.stderr
index 135d8150c34..6d8320bc053 100644
--- a/src/test/ui/span/issue-25199.stderr
+++ b/src/test/ui/span/issue-25199.stderr
@@ -14,7 +14,7 @@ error[E0597]: `container` does not live long enough
    |
 LL |     container.store(test);
    |     ^^^^^^^^^ borrowed value does not live long enough
-LL |     //~^ ERROR `container` does not live long enough
+LL |
 LL | }
    | - `container` dropped here while still borrowed
    |
diff --git a/src/test/ui/span/issue-27522.stderr b/src/test/ui/span/issue-27522.stderr
index 1fcb839d170..c99231a5336 100644
--- a/src/test/ui/span/issue-27522.stderr
+++ b/src/test/ui/span/issue-27522.stderr
@@ -1,7 +1,7 @@
 error[E0307]: invalid method receiver type: &SomeType
   --> $DIR/issue-27522.rs:6:22
    |
-LL |     fn handler(self: &SomeType); //~ ERROR invalid method receiver type
+LL |     fn handler(self: &SomeType);
    |                      ^^^^^^^^^
    |
    = note: type must be `Self` or a type that dereferences to it
diff --git a/src/test/ui/span/issue-29595.stderr b/src/test/ui/span/issue-29595.stderr
index dbb1743ec0e..24dfdf8ebc2 100644
--- a/src/test/ui/span/issue-29595.stderr
+++ b/src/test/ui/span/issue-29595.stderr
@@ -1,7 +1,7 @@
 error[E0277]: the trait bound `u8: Tr` is not satisfied
   --> $DIR/issue-29595.rs:6:17
    |
-LL |     let a: u8 = Tr::C; //~ ERROR the trait bound `u8: Tr` is not satisfied
+LL |     let a: u8 = Tr::C;
    |                 ^^^^^ the trait `Tr` is not implemented for `u8`
    |
 note: required by `Tr::C`
diff --git a/src/test/ui/span/issue-34264.stderr b/src/test/ui/span/issue-34264.stderr
index 9b3b68f6ff4..c5b6245572c 100644
--- a/src/test/ui/span/issue-34264.stderr
+++ b/src/test/ui/span/issue-34264.stderr
@@ -1,34 +1,34 @@
 error: expected one of `:` or `@`, found `<`
   --> $DIR/issue-34264.rs:1:14
    |
-LL | fn foo(Option<i32>, String) {} //~ ERROR expected one of
+LL | fn foo(Option<i32>, String) {}
    |              ^ expected one of `:` or `@` here
 
 error: expected one of `:` or `@`, found `)`
   --> $DIR/issue-34264.rs:1:27
    |
-LL | fn foo(Option<i32>, String) {} //~ ERROR expected one of
+LL | fn foo(Option<i32>, String) {}
    |                           ^ expected one of `:` or `@` here
 
 error: expected one of `:` or `@`, found `,`
   --> $DIR/issue-34264.rs:3:9
    |
-LL | fn bar(x, y: usize) {} //~ ERROR expected one of
+LL | fn bar(x, y: usize) {}
    |         ^ expected one of `:` or `@` here
 
 error[E0061]: this function takes 2 parameters but 3 parameters were supplied
   --> $DIR/issue-34264.rs:7:5
    |
-LL | fn foo(Option<i32>, String) {} //~ ERROR expected one of
+LL | fn foo(Option<i32>, String) {}
    | --------------------------- defined here
 ...
-LL |     foo(Some(42), 2, ""); //~ ERROR this function takes
+LL |     foo(Some(42), 2, "");
    |     ^^^^^^^^^^^^^^^^^^^^ expected 2 parameters
 
 error[E0308]: mismatched types
   --> $DIR/issue-34264.rs:8:13
    |
-LL |     bar("", ""); //~ ERROR mismatched types
+LL |     bar("", "");
    |             ^^ expected usize, found reference
    |
    = note: expected type `usize`
@@ -37,10 +37,10 @@ LL |     bar("", ""); //~ ERROR mismatched types
 error[E0061]: this function takes 2 parameters but 3 parameters were supplied
   --> $DIR/issue-34264.rs:10:5
    |
-LL | fn bar(x, y: usize) {} //~ ERROR expected one of
+LL | fn bar(x, y: usize) {}
    | ------------------- defined here
 ...
-LL |     bar(1, 2, 3); //~ ERROR this function takes
+LL |     bar(1, 2, 3);
    |     ^^^^^^^^^^^^ expected 2 parameters
 
 error: aborting due to 6 previous errors
diff --git a/src/test/ui/span/issue-36530.stderr b/src/test/ui/span/issue-36530.stderr
index b2b494a2c9c..05b2ca90570 100644
--- a/src/test/ui/span/issue-36530.stderr
+++ b/src/test/ui/span/issue-36530.stderr
@@ -1,7 +1,7 @@
 error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642)
   --> $DIR/issue-36530.rs:3:3
    |
-LL | #[foo] //~ ERROR is currently unknown to the compiler
+LL | #[foo]
    |   ^^^
    |
    = help: add #![feature(custom_attribute)] to the crate attributes to enable
@@ -9,7 +9,7 @@ LL | #[foo] //~ ERROR is currently unknown to the compiler
 error[E0658]: non-builtin inner attributes are unstable (see issue #54726)
   --> $DIR/issue-36530.rs:5:5
    |
-LL |     #![foo] //~ ERROR is currently unknown to the compiler
+LL |     #![foo]
    |     ^^^^^^^
    |
    = help: add #![feature(custom_inner_attributes)] to the crate attributes to enable
@@ -17,7 +17,7 @@ LL |     #![foo] //~ ERROR is currently unknown to the compiler
 error[E0658]: The attribute `foo` is currently unknown to the compiler and may have meaning added to it in the future (see issue #29642)
   --> $DIR/issue-36530.rs:5:8
    |
-LL |     #![foo] //~ ERROR is currently unknown to the compiler
+LL |     #![foo]
    |        ^^^
    |
    = help: add #![feature(custom_attribute)] to the crate attributes to enable
diff --git a/src/test/ui/span/issue-37767.stderr b/src/test/ui/span/issue-37767.stderr
index f91f2a50e85..0bbff45436c 100644
--- a/src/test/ui/span/issue-37767.stderr
+++ b/src/test/ui/span/issue-37767.stderr
@@ -1,7 +1,7 @@
 error[E0034]: multiple applicable items in scope
   --> $DIR/issue-37767.rs:10:7
    |
-LL |     a.foo() //~ ERROR multiple applicable items
+LL |     a.foo()
    |       ^^^ multiple `foo` found
    |
 note: candidate #1 is defined in the trait `A`
@@ -20,7 +20,7 @@ LL |     fn foo(&mut self) {}
 error[E0034]: multiple applicable items in scope
   --> $DIR/issue-37767.rs:22:7
    |
-LL |     a.foo() //~ ERROR multiple applicable items
+LL |     a.foo()
    |       ^^^ multiple `foo` found
    |
 note: candidate #1 is defined in the trait `C`
@@ -39,7 +39,7 @@ LL |     fn foo(&self) {}
 error[E0034]: multiple applicable items in scope
   --> $DIR/issue-37767.rs:34:7
    |
-LL |     a.foo() //~ ERROR multiple applicable items
+LL |     a.foo()
    |       ^^^ multiple `foo` found
    |
 note: candidate #1 is defined in the trait `E`
diff --git a/src/test/ui/span/issue-42234-unknown-receiver-type.stderr b/src/test/ui/span/issue-42234-unknown-receiver-type.stderr
index 1899a4e55d5..8923de5705b 100644
--- a/src/test/ui/span/issue-42234-unknown-receiver-type.stderr
+++ b/src/test/ui/span/issue-42234-unknown-receiver-type.stderr
@@ -11,7 +11,7 @@ LL |     x.unwrap().method_that_could_exist_on_some_type();
 error[E0282]: type annotations needed
   --> $DIR/issue-42234-unknown-receiver-type.rs:12:5
    |
-LL | /     data.iter() //~ ERROR type annotations needed
+LL | /     data.iter()
 LL | |         .sum::<_>()
    | |___________________^ cannot infer type
    |
diff --git a/src/test/ui/span/issue28498-reject-ex1.stderr b/src/test/ui/span/issue28498-reject-ex1.stderr
index 8daef82f8bb..1438b95d733 100644
--- a/src/test/ui/span/issue28498-reject-ex1.stderr
+++ b/src/test/ui/span/issue28498-reject-ex1.stderr
@@ -14,7 +14,7 @@ error[E0597]: `foo.data` does not live long enough
    |
 LL |     foo.data[1].1.set(Some(&foo.data[0]));
    |                             ^^^^^^^^ borrowed value does not live long enough
-LL |     //~^ ERROR `foo.data` does not live long enough
+LL |
 LL | }
    | - `foo.data` dropped here while still borrowed
    |
diff --git a/src/test/ui/span/lint-unused-unsafe.stderr b/src/test/ui/span/lint-unused-unsafe.stderr
index 7f16cfae859..ac8107990c2 100644
--- a/src/test/ui/span/lint-unused-unsafe.stderr
+++ b/src/test/ui/span/lint-unused-unsafe.stderr
@@ -1,7 +1,7 @@
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:16:13
    |
-LL | fn bad1() { unsafe {} }                  //~ ERROR: unnecessary `unsafe` block
+LL | fn bad1() { unsafe {} }
    |             ^^^^^^ unnecessary `unsafe` block
    |
 note: lint level defined here
@@ -13,13 +13,13 @@ LL | #![deny(unused_unsafe)]
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:17:13
    |
-LL | fn bad2() { unsafe { bad1() } }          //~ ERROR: unnecessary `unsafe` block
+LL | fn bad2() { unsafe { bad1() } }
    |             ^^^^^^ unnecessary `unsafe` block
 
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:18:20
    |
-LL | unsafe fn bad3() { unsafe {} }           //~ ERROR: unnecessary `unsafe` block
+LL | unsafe fn bad3() { unsafe {} }
    | ----------------   ^^^^^^ unnecessary `unsafe` block
    | |
    | because it's nested under this `unsafe` fn
@@ -27,13 +27,13 @@ LL | unsafe fn bad3() { unsafe {} }           //~ ERROR: unnecessary `unsafe` bl
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:19:13
    |
-LL | fn bad4() { unsafe { callback(||{}) } }  //~ ERROR: unnecessary `unsafe` block
+LL | fn bad4() { unsafe { callback(||{}) } }
    |             ^^^^^^ unnecessary `unsafe` block
 
 error: unnecessary `unsafe` block
   --> $DIR/lint-unused-unsafe.rs:20:20
    |
-LL | unsafe fn bad5() { unsafe { unsf() } }   //~ ERROR: unnecessary `unsafe` block
+LL | unsafe fn bad5() { unsafe { unsf() } }
    | ----------------   ^^^^^^ unnecessary `unsafe` block
    | |
    | because it's nested under this `unsafe` fn
@@ -43,7 +43,7 @@ error: unnecessary `unsafe` block
    |
 LL |     unsafe {                             // don't put the warning here
    |     ------ because it's nested under this `unsafe` block
-LL |         unsafe {                         //~ ERROR: unnecessary `unsafe` block
+LL |         unsafe {
    |         ^^^^^^ unnecessary `unsafe` block
 
 error: unnecessary `unsafe` block
@@ -51,7 +51,7 @@ error: unnecessary `unsafe` block
    |
 LL | unsafe fn bad7() {
    | ---------------- because it's nested under this `unsafe` fn
-LL |     unsafe {                             //~ ERROR: unnecessary `unsafe` block
+LL |     unsafe {
    |     ^^^^^^ unnecessary `unsafe` block
 
 error: unnecessary `unsafe` block
@@ -59,8 +59,8 @@ error: unnecessary `unsafe` block
    |
 LL | unsafe fn bad7() {
    | ---------------- because it's nested under this `unsafe` fn
-LL |     unsafe {                             //~ ERROR: unnecessary `unsafe` block
-LL |         unsafe {                         //~ ERROR: unnecessary `unsafe` block
+LL |     unsafe {
+LL |         unsafe {
    |         ^^^^^^ unnecessary `unsafe` block
 
 error: aborting due to 8 previous errors
diff --git a/src/test/ui/span/macro-span-replacement.stderr b/src/test/ui/span/macro-span-replacement.stderr
index f6c303164bf..128e4ec1212 100644
--- a/src/test/ui/span/macro-span-replacement.stderr
+++ b/src/test/ui/span/macro-span-replacement.stderr
@@ -1,7 +1,7 @@
 warning: struct is never constructed: `S`
   --> $DIR/macro-span-replacement.rs:7:14
    |
-LL |         $b $a; //~ WARN struct is never constructed
+LL |         $b $a;
    |              ^
 ...
 LL |     m!(S struct);
diff --git a/src/test/ui/span/macro-ty-params.stderr b/src/test/ui/span/macro-ty-params.stderr
index 965ca7000be..39b3edc6703 100644
--- a/src/test/ui/span/macro-ty-params.stderr
+++ b/src/test/ui/span/macro-ty-params.stderr
@@ -1,25 +1,25 @@
 error: generic arguments in macro path
   --> $DIR/macro-ty-params.rs:10:10
    |
-LL |     foo::<T>!(); //~ ERROR generic arguments in macro path
+LL |     foo::<T>!();
    |          ^^^
 
 error: generic arguments in macro path
   --> $DIR/macro-ty-params.rs:11:10
    |
-LL |     foo::<>!(); //~ ERROR generic arguments in macro path
+LL |     foo::<>!();
    |          ^^
 
 error: unexpected generic arguments in path
   --> $DIR/macro-ty-params.rs:12:8
    |
-LL |     m!(Default<>); //~ ERROR generic arguments in macro path
+LL |     m!(Default<>);
    |        ^^^^^^^^^
 
 error: generic arguments in macro path
   --> $DIR/macro-ty-params.rs:12:15
    |
-LL |     m!(Default<>); //~ ERROR generic arguments in macro path
+LL |     m!(Default<>);
    |               ^^
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/span/missing-unit-argument.stderr b/src/test/ui/span/missing-unit-argument.stderr
index bf19eb69461..f1a29bed32b 100644
--- a/src/test/ui/span/missing-unit-argument.stderr
+++ b/src/test/ui/span/missing-unit-argument.stderr
@@ -1,11 +1,11 @@
 error[E0061]: this function takes 1 parameter but 0 parameters were supplied
   --> $DIR/missing-unit-argument.rs:11:33
    |
-LL |     let _: Result<(), String> = Ok(); //~ ERROR this function takes
+LL |     let _: Result<(), String> = Ok();
    |                                 ^^^^
 help: expected the unit value `()`; create it with empty parentheses
    |
-LL |     let _: Result<(), String> = Ok(()); //~ ERROR this function takes
+LL |     let _: Result<(), String> = Ok(());
    |                                    ^^
 
 error[E0061]: this function takes 2 parameters but 0 parameters were supplied
@@ -14,7 +14,7 @@ error[E0061]: this function takes 2 parameters but 0 parameters were supplied
 LL | fn foo(():(), ():()) {}
    | -------------------- defined here
 ...
-LL |     foo(); //~ ERROR this function takes
+LL |     foo();
    |     ^^^^^ expected 2 parameters
 
 error[E0061]: this function takes 2 parameters but 1 parameter was supplied
@@ -23,7 +23,7 @@ error[E0061]: this function takes 2 parameters but 1 parameter was supplied
 LL | fn foo(():(), ():()) {}
    | -------------------- defined here
 ...
-LL |     foo(()); //~ ERROR this function takes
+LL |     foo(());
    |     ^^^^^^^ expected 2 parameters
 
 error[E0061]: this function takes 1 parameter but 0 parameters were supplied
@@ -32,11 +32,11 @@ error[E0061]: this function takes 1 parameter but 0 parameters were supplied
 LL | fn bar(():()) {}
    | ------------- defined here
 ...
-LL |     bar(); //~ ERROR this function takes
+LL |     bar();
    |     ^^^^^
 help: expected the unit value `()`; create it with empty parentheses
    |
-LL |     bar(()); //~ ERROR this function takes
+LL |     bar(());
    |         ^^
 
 error[E0061]: this function takes 1 parameter but 0 parameters were supplied
@@ -45,11 +45,11 @@ error[E0061]: this function takes 1 parameter but 0 parameters were supplied
 LL |     fn baz(self, (): ()) { }
    |     -------------------- defined here
 ...
-LL |     S.baz(); //~ ERROR this function takes
+LL |     S.baz();
    |       ^^^
 help: expected the unit value `()`; create it with empty parentheses
    |
-LL |     S.baz(()); //~ ERROR this function takes
+LL |     S.baz(());
    |           ^^
 
 error[E0061]: this function takes 1 parameter but 0 parameters were supplied
@@ -58,11 +58,11 @@ error[E0061]: this function takes 1 parameter but 0 parameters were supplied
 LL |     fn generic<T>(self, _: T) { }
    |     ------------------------- defined here
 ...
-LL |     S.generic::<()>(); //~ ERROR this function takes
+LL |     S.generic::<()>();
    |       ^^^^^^^
 help: expected the unit value `()`; create it with empty parentheses
    |
-LL |     S.generic::<()>(()); //~ ERROR this function takes
+LL |     S.generic::<()>(());
    |                     ^^
 
 error: aborting due to 6 previous errors
diff --git a/src/test/ui/span/move-closure.stderr b/src/test/ui/span/move-closure.stderr
index f09e052f653..e2226b197ae 100644
--- a/src/test/ui/span/move-closure.stderr
+++ b/src/test/ui/span/move-closure.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/move-closure.rs:5:17
    |
-LL |     let x: () = move || (); //~ ERROR mismatched types
+LL |     let x: () = move || ();
    |                 ^^^^^^^^^^ expected (), found closure
    |
    = note: expected type `()`
diff --git a/src/test/ui/span/multiline-span-E0072.stderr b/src/test/ui/span/multiline-span-E0072.stderr
index ee392f5994c..dd322fe833b 100644
--- a/src/test/ui/span/multiline-span-E0072.stderr
+++ b/src/test/ui/span/multiline-span-E0072.stderr
@@ -1,7 +1,7 @@
 error[E0072]: recursive type `ListNode` has infinite size
   --> $DIR/multiline-span-E0072.rs:2:1
    |
-LL | / struct //~ ERROR has infinite size
+LL | / struct
 LL | | ListNode
 LL | | {
 LL | |     head: u8,
diff --git a/src/test/ui/span/multiline-span-simple.stderr b/src/test/ui/span/multiline-span-simple.stderr
index 18b6cd06afb..6495d9bc739 100644
--- a/src/test/ui/span/multiline-span-simple.stderr
+++ b/src/test/ui/span/multiline-span-simple.stderr
@@ -1,7 +1,7 @@
 error[E0277]: cannot add `()` to `u32`
   --> $DIR/multiline-span-simple.rs:13:18
    |
-LL |     foo(1 as u32 + //~ ERROR cannot add `()` to `u32`
+LL |     foo(1 as u32 +
    |                  ^ no implementation for `u32 + ()`
    |
    = help: the trait `std::ops::Add<()>` is not implemented for `u32`
diff --git a/src/test/ui/span/mut-arg-hint.stderr b/src/test/ui/span/mut-arg-hint.stderr
index ea6fc8bee63..ce5786186ea 100644
--- a/src/test/ui/span/mut-arg-hint.stderr
+++ b/src/test/ui/span/mut-arg-hint.stderr
@@ -3,7 +3,7 @@ error[E0596]: cannot borrow immutable borrowed content `*a` as mutable
    |
 LL |     fn foo(mut a: &String) {
    |                   ------- use `&mut String` here to make mutable
-LL |         a.push_str("bar"); //~ ERROR cannot borrow immutable borrowed content
+LL |         a.push_str("bar");
    |         ^ cannot borrow as mutable
 
 error[E0596]: cannot borrow immutable borrowed content `*a` as mutable
@@ -11,7 +11,7 @@ error[E0596]: cannot borrow immutable borrowed content `*a` as mutable
    |
 LL | pub fn foo<'a>(mut a: &'a String) {
    |                       ---------- use `&'a mut String` here to make mutable
-LL |     a.push_str("foo"); //~ ERROR cannot borrow immutable borrowed content
+LL |     a.push_str("foo");
    |     ^ cannot borrow as mutable
 
 error[E0596]: cannot borrow immutable borrowed content `*a` as mutable
@@ -19,7 +19,7 @@ error[E0596]: cannot borrow immutable borrowed content `*a` as mutable
    |
 LL |     pub fn foo(mut a: &String) {
    |                       ------- use `&mut String` here to make mutable
-LL |         a.push_str("foo"); //~ ERROR cannot borrow immutable borrowed content
+LL |         a.push_str("foo");
    |         ^ cannot borrow as mutable
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/span/non-existing-module-import.stderr b/src/test/ui/span/non-existing-module-import.stderr
index 5ac5df1b4c7..25c09959047 100644
--- a/src/test/ui/span/non-existing-module-import.stderr
+++ b/src/test/ui/span/non-existing-module-import.stderr
@@ -1,7 +1,7 @@
 error[E0432]: unresolved import `std::bar`
   --> $DIR/non-existing-module-import.rs:1:10
    |
-LL | use std::bar::{foo1, foo2}; //~ ERROR unresolved import
+LL | use std::bar::{foo1, foo2};
    |          ^^^ could not find `bar` in `std`
 
 error: aborting due to previous error
diff --git a/src/test/ui/span/pub-struct-field.stderr b/src/test/ui/span/pub-struct-field.stderr
index 66afbf253c9..065340f446a 100644
--- a/src/test/ui/span/pub-struct-field.stderr
+++ b/src/test/ui/span/pub-struct-field.stderr
@@ -3,7 +3,7 @@ error[E0124]: field `bar` is already declared
    |
 LL |     bar: u8,
    |     ------- `bar` first declared here
-LL |     pub bar: u8, //~ ERROR is already declared
+LL |     pub bar: u8,
    |     ^^^^^^^^^^^ field already declared
 
 error[E0124]: field `bar` is already declared
@@ -11,8 +11,8 @@ error[E0124]: field `bar` is already declared
    |
 LL |     bar: u8,
    |     ------- `bar` first declared here
-LL |     pub bar: u8, //~ ERROR is already declared
-LL |     pub(crate) bar: u8, //~ ERROR is already declared
+LL |     pub bar: u8,
+LL |     pub(crate) bar: u8,
    |     ^^^^^^^^^^^^^^^^^^ field already declared
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/span/recursive-type-field.stderr b/src/test/ui/span/recursive-type-field.stderr
index 3a8f0e60038..d240872647e 100644
--- a/src/test/ui/span/recursive-type-field.stderr
+++ b/src/test/ui/span/recursive-type-field.stderr
@@ -1,7 +1,7 @@
 error[E0072]: recursive type `Foo` has infinite size
   --> $DIR/recursive-type-field.rs:3:1
    |
-LL | struct Foo<'a> { //~ ERROR recursive type
+LL | struct Foo<'a> {
    | ^^^^^^^^^^^^^^ recursive type has infinite size
 LL |     bar: Bar<'a>,
    |     ------------ recursive without indirection
@@ -11,7 +11,7 @@ LL |     bar: Bar<'a>,
 error[E0072]: recursive type `Bar` has infinite size
   --> $DIR/recursive-type-field.rs:8:1
    |
-LL | struct Bar<'a> { //~ ERROR recursive type
+LL | struct Bar<'a> {
    | ^^^^^^^^^^^^^^ recursive type has infinite size
 LL |     y: (Foo<'a>, Foo<'a>),
    |     --------------------- recursive without indirection
diff --git a/src/test/ui/span/regions-escape-loop-via-variable.stderr b/src/test/ui/span/regions-escape-loop-via-variable.stderr
index e3870db0c66..ef36b81f493 100644
--- a/src/test/ui/span/regions-escape-loop-via-variable.stderr
+++ b/src/test/ui/span/regions-escape-loop-via-variable.stderr
@@ -5,7 +5,7 @@ LL |         p = &x;
    |              ^ borrowed value does not live long enough
 LL |     }
    |     - `x` dropped here while still borrowed
-LL |     //~^^ ERROR `x` does not live long enough
+LL |
 LL | }
    | - borrowed value needs to live until here
 
diff --git a/src/test/ui/span/regions-escape-loop-via-vec.stderr b/src/test/ui/span/regions-escape-loop-via-vec.stderr
index 09a7123d8f0..1d604b58d7e 100644
--- a/src/test/ui/span/regions-escape-loop-via-vec.stderr
+++ b/src/test/ui/span/regions-escape-loop-via-vec.stderr
@@ -14,7 +14,7 @@ error[E0503]: cannot use `x` because it was mutably borrowed
    |
 LL |     let mut _y = vec![&mut x];
    |                            - borrow of `x` occurs here
-LL |     while x < 10 { //~ ERROR cannot use `x` because it was mutably borrowed
+LL |     while x < 10 {
    |           ^ use of borrowed `x`
 
 error[E0503]: cannot use `x` because it was mutably borrowed
@@ -22,8 +22,8 @@ error[E0503]: cannot use `x` because it was mutably borrowed
    |
 LL |     let mut _y = vec![&mut x];
    |                            - borrow of `x` occurs here
-LL |     while x < 10 { //~ ERROR cannot use `x` because it was mutably borrowed
-LL |         let mut z = x; //~ ERROR cannot use `x` because it was mutably borrowed
+LL |     while x < 10 {
+LL |         let mut z = x;
    |             ^^^^^ use of borrowed `x`
 
 error[E0506]: cannot assign to `x` because it is borrowed
@@ -32,7 +32,7 @@ error[E0506]: cannot assign to `x` because it is borrowed
 LL |     let mut _y = vec![&mut x];
    |                            - borrow of `x` occurs here
 ...
-LL |         x += 1; //~ ERROR cannot assign
+LL |         x += 1;
    |         ^^^^^^ assignment to borrowed `x` occurs here
 
 error: aborting due to 4 previous errors
diff --git a/src/test/ui/span/send-is-not-static-std-sync.stderr b/src/test/ui/span/send-is-not-static-std-sync.stderr
index 74c2bad24de..aa9e1c2de22 100644
--- a/src/test/ui/span/send-is-not-static-std-sync.stderr
+++ b/src/test/ui/span/send-is-not-static-std-sync.stderr
@@ -14,7 +14,7 @@ error[E0505]: cannot move out of `y` because it is borrowed
    |
 LL |     *lock.lock().unwrap() = &*y;
    |                              -- borrow of `*y` occurs here
-LL |     drop(y); //~ ERROR cannot move out
+LL |     drop(y);
    |          ^ move out of `y` occurs here
 
 error[E0597]: `z` does not live long enough
@@ -33,7 +33,7 @@ error[E0505]: cannot move out of `y` because it is borrowed
    |
 LL |     *lock.write().unwrap() = &*y;
    |                               -- borrow of `*y` occurs here
-LL |     drop(y); //~ ERROR cannot move out
+LL |     drop(y);
    |          ^ move out of `y` occurs here
 
 error[E0597]: `z` does not live long enough
@@ -52,7 +52,7 @@ error[E0505]: cannot move out of `y` because it is borrowed
    |
 LL |     tx.send(&*y);
    |              -- borrow of `*y` occurs here
-LL |     drop(y); //~ ERROR cannot move out
+LL |     drop(y);
    |          ^ move out of `y` occurs here
 
 error: aborting due to 6 previous errors
diff --git a/src/test/ui/span/suggestion-non-ascii.stderr b/src/test/ui/span/suggestion-non-ascii.stderr
index 40b11695d75..b14632d4e1b 100644
--- a/src/test/ui/span/suggestion-non-ascii.stderr
+++ b/src/test/ui/span/suggestion-non-ascii.stderr
@@ -1,7 +1,7 @@
 error[E0608]: cannot index into a value of type `({integer},)`
   --> $DIR/suggestion-non-ascii.rs:3:21
    |
-LL |     println!("☃{}", tup[0]); //~ ERROR cannot index into a value of type
+LL |     println!("☃{}", tup[0]);
    |                     ^^^^^^ help: to access tuple elements, use: `tup.0`
 
 error: aborting due to previous error
diff --git a/src/test/ui/span/typo-suggestion.stderr b/src/test/ui/span/typo-suggestion.stderr
index 7b12c4430ed..61d4e06119c 100644
--- a/src/test/ui/span/typo-suggestion.stderr
+++ b/src/test/ui/span/typo-suggestion.stderr
@@ -1,13 +1,13 @@
 error[E0425]: cannot find value `bar` in this scope
   --> $DIR/typo-suggestion.rs:5:26
    |
-LL |     println!("Hello {}", bar); //~ ERROR cannot find value
+LL |     println!("Hello {}", bar);
    |                          ^^^ not found in this scope
 
 error[E0425]: cannot find value `fob` in this scope
   --> $DIR/typo-suggestion.rs:8:26
    |
-LL |     println!("Hello {}", fob); //~ ERROR cannot find value
+LL |     println!("Hello {}", fob);
    |                          ^^^ help: a local variable with a similar name exists: `foo`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/span/unused-warning-point-at-signature.stderr b/src/test/ui/span/unused-warning-point-at-signature.stderr
index e07548121b5..3007d90c990 100644
--- a/src/test/ui/span/unused-warning-point-at-signature.stderr
+++ b/src/test/ui/span/unused-warning-point-at-signature.stderr
@@ -1,7 +1,7 @@
 warning: enum is never used: `Enum`
   --> $DIR/unused-warning-point-at-signature.rs:5:1
    |
-LL | enum Enum { //~ WARN enum is never used
+LL | enum Enum {
    | ^^^^^^^^^
    |
 note: lint level defined here
@@ -14,19 +14,19 @@ LL | #![warn(unused)]
 warning: struct is never constructed: `Struct`
   --> $DIR/unused-warning-point-at-signature.rs:12:1
    |
-LL | struct Struct { //~ WARN struct is never constructed
+LL | struct Struct {
    | ^^^^^^^^^^^^^
 
 warning: function is never used: `func`
   --> $DIR/unused-warning-point-at-signature.rs:19:1
    |
-LL | fn func() -> usize { //~ WARN function is never used
+LL | fn func() -> usize {
    | ^^^^^^^^^^^^^^^^^^
 
 warning: function is never used: `func_complete_span`
   --> $DIR/unused-warning-point-at-signature.rs:23:1
    |
-LL | / fn //~ WARN function is never used
+LL | / fn
 LL | | func_complete_span()
 LL | | -> usize
 LL | | {
diff --git a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr b/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr
index 1eee88ad21a..b957243018d 100644
--- a/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr
+++ b/src/test/ui/span/vec-must-not-hide-type-from-dropck.stderr
@@ -14,7 +14,7 @@ error[E0597]: `c1` does not live long enough
    |
 LL |     c2.v[0].v.set(Some(&c1));
    |                         ^^ borrowed value does not live long enough
-LL |     //~^ ERROR `c1` does not live long enough
+LL |
 LL | }
    | - `c1` dropped here while still borrowed
    |
diff --git a/src/test/ui/span/visibility-ty-params.stderr b/src/test/ui/span/visibility-ty-params.stderr
index d7914528f46..ddc13bb1c76 100644
--- a/src/test/ui/span/visibility-ty-params.stderr
+++ b/src/test/ui/span/visibility-ty-params.stderr
@@ -1,19 +1,19 @@
 error: unexpected generic arguments in path
   --> $DIR/visibility-ty-params.rs:6:5
    |
-LL | m!{ S<u8> } //~ ERROR unexpected generic arguments in path
+LL | m!{ S<u8> }
    |     ^^^^^
 
 error: unexpected generic arguments in path
   --> $DIR/visibility-ty-params.rs:10:9
    |
-LL |     m!{ m<> } //~ ERROR unexpected generic arguments in path
+LL |     m!{ m<> }
    |         ^^^
 
 error[E0577]: expected module, found struct `S`
   --> $DIR/visibility-ty-params.rs:6:5
    |
-LL | m!{ S<u8> } //~ ERROR unexpected generic arguments in path
+LL | m!{ S<u8> }
    |     -^^^^
    |     |
    |     help: a module with a similar name exists: `m`