Update tests

13 files changed, 20 insertions, 20 deletions

diff --git a/src/test/ui/codemap_tests/bad-format-args.stderr b/src/test/ui/codemap_tests/bad-format-args.stderr
index 38320416b45..c424eb08a7a 100644
--- a/src/test/ui/codemap_tests/bad-format-args.stderr
+++ b/src/test/ui/codemap_tests/bad-format-args.stderr
@@ -1,7 +1,7 @@
 error: requires at least a format string argument
   --> $DIR/bad-format-args.rs:2:5
    |
-LL |     format!(); //~ ERROR requires at least a format string argument
+LL |     format!();
    |     ^^^^^^^^^^
    |
    = note: this error originates in a macro outside of the current crate (in Nightly builds, run with -Z external-macro-backtrace for more info)
@@ -9,13 +9,13 @@ LL |     format!(); //~ ERROR requires at least a format string argument
 error: expected token: `,`
   --> $DIR/bad-format-args.rs:3:16
    |
-LL |     format!("" 1); //~ ERROR expected token: `,`
+LL |     format!("" 1);
    |                ^
 
 error: expected token: `,`
   --> $DIR/bad-format-args.rs:4:19
    |
-LL |     format!("", 1 1); //~ ERROR expected token: `,`
+LL |     format!("", 1 1);
    |                   ^
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
index 5f8bc387a3d..087084ae5da 100644
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
+++ b/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
@@ -1,7 +1,7 @@
 error[E0592]: duplicate definitions with name `f`
   --> $DIR/coherence-overlapping-inherent-impl-trait.rs:4:10
    |
-LL | impl C { fn f() {} } //~ ERROR duplicate
+LL | impl C { fn f() {} }
    |          ^^^^^^^^^ duplicate definitions for `f`
 LL | impl C { fn f() {} }
    |          --------- other definition for `f`
diff --git a/src/test/ui/codemap_tests/empty_span.stderr b/src/test/ui/codemap_tests/empty_span.stderr
index f5285677097..1dd99cfd64f 100644
--- a/src/test/ui/codemap_tests/empty_span.stderr
+++ b/src/test/ui/codemap_tests/empty_span.stderr
@@ -1,7 +1,7 @@
 error[E0321]: cross-crate traits with a default impl, like `std::marker::Send`, can only be implemented for a struct/enum type, not `&'static main::Foo`
   --> $DIR/empty_span.rs:7:5
    |
-LL |     unsafe impl Send for &'static Foo { } //~ ERROR cross-crate traits with a default impl
+LL |     unsafe impl Send for &'static Foo { }
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ can't implement cross-crate trait with a default impl for non-struct/enum type
 
 error: aborting due to previous error
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
index 41df802b503..13bd666a507 100644
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
+++ b/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow immutable local variable `x` as mutable
 LL |     let x = "foo";
    |         - help: make this binding mutable: `mut x`
 ...
-LL |     let y = &mut x; //~ ERROR cannot borrow
+LL |     let y = &mut x;
    |                  ^ cannot borrow mutably
 
 error: aborting due to previous error
diff --git a/src/test/ui/codemap_tests/issue-11715.stderr b/src/test/ui/codemap_tests/issue-11715.stderr
index 8f320a4e19b..c37e6b34727 100644
--- a/src/test/ui/codemap_tests/issue-11715.stderr
+++ b/src/test/ui/codemap_tests/issue-11715.stderr
@@ -3,7 +3,7 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time
    |
 LL |     let y = &mut x;
    |                  - first mutable borrow occurs here
-LL |     let z = &mut x; //~ ERROR cannot borrow
+LL |     let z = &mut x;
    |                  ^ second mutable borrow occurs here
 ...
 LL | }
diff --git a/src/test/ui/codemap_tests/one_line.stderr b/src/test/ui/codemap_tests/one_line.stderr
index 2ea793c0969..9dcaba8748e 100644
--- a/src/test/ui/codemap_tests/one_line.stderr
+++ b/src/test/ui/codemap_tests/one_line.stderr
@@ -1,7 +1,7 @@
 error[E0499]: cannot borrow `v` as mutable more than once at a time
   --> $DIR/one_line.rs:3:12
    |
-LL |     v.push(v.pop().unwrap()); //~ ERROR cannot borrow
+LL |     v.push(v.pop().unwrap());
    |     -      ^               - first borrow ends here
    |     |      |
    |     |      second mutable borrow occurs here
diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr b/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
index 1b20b699d9f..70c1093e9ed 100644
--- a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
+++ b/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
@@ -1,7 +1,7 @@
 error[E0592]: duplicate definitions with name `id`
   --> $DIR/overlapping_inherent_impls.rs:9:5
    |
-LL |     fn id() {} //~ ERROR duplicate definitions
+LL |     fn id() {}
    |     ^^^^^^^^^^ duplicate definitions for `id`
 ...
 LL |     fn id() {}
@@ -10,7 +10,7 @@ LL |     fn id() {}
 error[E0592]: duplicate definitions with name `bar`
   --> $DIR/overlapping_inherent_impls.rs:19:5
    |
-LL |     fn bar(&self) {} //~ ERROR duplicate definitions
+LL |     fn bar(&self) {}
    |     ^^^^^^^^^^^^^^^^ duplicate definitions for `bar`
 ...
 LL |     fn bar(&self) {}
@@ -19,7 +19,7 @@ LL |     fn bar(&self) {}
 error[E0592]: duplicate definitions with name `baz`
   --> $DIR/overlapping_inherent_impls.rs:29:5
    |
-LL |     fn baz(&self) {} //~ ERROR duplicate definitions
+LL |     fn baz(&self) {}
    |     ^^^^^^^^^^^^^^^^ duplicate definitions for `baz`
 ...
 LL |     fn baz(&self) {}
diff --git a/src/test/ui/codemap_tests/tab.stderr b/src/test/ui/codemap_tests/tab.stderr
index 80b5773fda3..bcc21e9c7ad 100644
--- a/src/test/ui/codemap_tests/tab.stderr
+++ b/src/test/ui/codemap_tests/tab.stderr
@@ -1,7 +1,7 @@
 error[E0425]: cannot find value `bar` in this scope
   --> $DIR/tab.rs:4:2
    |
-LL |     bar; //~ ERROR cannot find value `bar`
+LL |     bar;
    |     ^^^ not found in this scope
 
 error[E0308]: mismatched types
@@ -9,7 +9,7 @@ error[E0308]: mismatched types
    |
 LL | fn foo() {
    |          - help: try adding a return type: `-> &'static str`
-LL |     "bar            boo" //~ ERROR mismatched types
+LL |     "bar            boo"
    |     ^^^^^^^^^^^^^^^^^^^^ expected (), found reference
    |
    = note: expected type `()`
diff --git a/src/test/ui/codemap_tests/tab_2.stderr b/src/test/ui/codemap_tests/tab_2.stderr
index f7eec3eb8da..70414bbd953 100644
--- a/src/test/ui/codemap_tests/tab_2.stderr
+++ b/src/test/ui/codemap_tests/tab_2.stderr
@@ -1,7 +1,7 @@
 error: unterminated double quote string
   --> $DIR/tab_2.rs:4:7
    |
-LL |                   """; //~ ERROR unterminated double quote
+LL |                   """;
    |  ___________________^
 LL | | }
    | |__^
diff --git a/src/test/ui/codemap_tests/tab_3.stderr b/src/test/ui/codemap_tests/tab_3.stderr
index 6e93ae13069..4b550dbf9ee 100644
--- a/src/test/ui/codemap_tests/tab_3.stderr
+++ b/src/test/ui/codemap_tests/tab_3.stderr
@@ -4,7 +4,7 @@ error[E0382]: use of moved value: `some_vec`
 LL |     some_vec.into_iter();
    |     -------- value moved here
 LL |     {
-LL |         println!("{:?}", some_vec); //~ ERROR use of moved
+LL |         println!("{:?}", some_vec);
    |                          ^^^^^^^^ value used here after move
    |
    = note: move occurs because `some_vec` has type `std::vec::Vec<&str>`, which does not implement the `Copy` trait
diff --git a/src/test/ui/codemap_tests/two_files.stderr b/src/test/ui/codemap_tests/two_files.stderr
index 65df3f382c0..5027b78b38e 100644
--- a/src/test/ui/codemap_tests/two_files.stderr
+++ b/src/test/ui/codemap_tests/two_files.stderr
@@ -1,7 +1,7 @@
 error[E0404]: expected trait, found type alias `Bar`
   --> $DIR/two_files.rs:5:6
    |
-LL | impl Bar for Baz { } //~ ERROR expected trait, found type alias
+LL | impl Bar for Baz { }
    |      ^^^ type aliases cannot be used as traits
    |
    = note: did you mean to use a trait alias?
diff --git a/src/test/ui/codemap_tests/unicode.stderr b/src/test/ui/codemap_tests/unicode.stderr
index 1ba6ac44788..7aadeb7dfc9 100644
--- a/src/test/ui/codemap_tests/unicode.stderr
+++ b/src/test/ui/codemap_tests/unicode.stderr
@@ -1,7 +1,7 @@
 error[E0703]: invalid ABI: found `路濫狼á́́`
   --> $DIR/unicode.rs:1:8
    |
-LL | extern "路濫狼á́́" fn foo() {} //~ ERROR invalid ABI
+LL | extern "路濫狼á́́" fn foo() {}
    |        ^^^^^^^^^ invalid ABI
    |
    = help: valid ABIs: cdecl, stdcall, fastcall, vectorcall, thiscall, aapcs, win64, sysv64, ptx-kernel, msp430-interrupt, x86-interrupt, amdgpu-kernel, Rust, C, system, rust-intrinsic, rust-call, platform-intrinsic, unadjusted
diff --git a/src/test/ui/codemap_tests/unicode_2.stderr b/src/test/ui/codemap_tests/unicode_2.stderr
index 1bc7452b9f2..92634d8e5f9 100644
--- a/src/test/ui/codemap_tests/unicode_2.stderr
+++ b/src/test/ui/codemap_tests/unicode_2.stderr
@@ -1,7 +1,7 @@
 error: invalid width `7` for integer literal
   --> $DIR/unicode_2.rs:4:25
    |
-LL |     let _ = ("a̐éö̲", 0u7); //~ ERROR invalid width
+LL |     let _ = ("a̐éö̲", 0u7);
    |                     ^^^
    |
    = help: valid widths are 8, 16, 32, 64 and 128
@@ -9,7 +9,7 @@ LL |     let _ = ("a̐éö̲", 0u7); //~ ERROR invalid width
 error: invalid width `42` for integer literal
   --> $DIR/unicode_2.rs:5:20
    |
-LL |     let _ = ("아あ", 1i42); //~ ERROR invalid width
+LL |     let _ = ("아あ", 1i42);
    |                      ^^^^
    |
    = help: valid widths are 8, 16, 32, 64 and 128
@@ -17,7 +17,7 @@ LL |     let _ = ("아あ", 1i42); //~ ERROR invalid width
 error[E0425]: cannot find value `a̐é` in this scope
   --> $DIR/unicode_2.rs:6:13
    |
-LL |     let _ = a̐é; //~ ERROR cannot find
+LL |     let _ = a̐é;
    |             ^^ not found in this scope
 
 error: aborting due to 3 previous errors