Update tests

11 files changed, 29 insertions, 29 deletions

diff --git a/src/test/ui/impl-trait/extra-item.stderr b/src/test/ui/impl-trait/extra-item.stderr
index de3c7ba5d31..728bcc0aa86 100644
--- a/src/test/ui/impl-trait/extra-item.stderr
+++ b/src/test/ui/impl-trait/extra-item.stderr
@@ -1,7 +1,7 @@
 error[E0407]: method `extra` is not a member of trait `extra_item::MyTrait`
   --> $DIR/extra-item.rs:7:5
    |
-LL |     fn extra() {} //~ ERROR method `extra` is not a member of trait `extra_item::MyTrait`
+LL |     fn extra() {}
    |     ^^^^^^^^^^^^^ not a member of trait `extra_item::MyTrait`
 
 error: aborting due to previous error
diff --git a/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.stderr b/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.stderr
index 99c8fe35c66..fb48ecd12b6 100644
--- a/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.stderr
+++ b/src/test/ui/impl-trait/infinite-impl-trait-issue-38064.stderr
@@ -1,7 +1,7 @@
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/infinite-impl-trait-issue-38064.rs:8:13
    |
-LL | fn foo() -> impl Quux { //~ opaque type expands to a recursive type
+LL | fn foo() -> impl Quux {
    |             ^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `foo::Foo<bar::Bar<impl Quux>>`
@@ -9,7 +9,7 @@ LL | fn foo() -> impl Quux { //~ opaque type expands to a recursive type
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/infinite-impl-trait-issue-38064.rs:14:13
    |
-LL | fn bar() -> impl Quux { //~ opaque type expands to a recursive type
+LL | fn bar() -> impl Quux {
    |             ^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `bar::Bar<foo::Foo<impl Quux>>`
diff --git a/src/test/ui/impl-trait/issue-55608-captures-empty-region.stderr b/src/test/ui/impl-trait/issue-55608-captures-empty-region.stderr
index d1f147834d2..6311a7f0067 100644
--- a/src/test/ui/impl-trait/issue-55608-captures-empty-region.stderr
+++ b/src/test/ui/impl-trait/issue-55608-captures-empty-region.stderr
@@ -1,7 +1,7 @@
 error[E0700]: hidden type for `impl Trait` captures lifetime that does not appear in bounds
   --> $DIR/issue-55608-captures-empty-region.rs:6:16
    |
-LL | fn server() -> impl FilterBase2 { //~ ERROR [E0700]
+LL | fn server() -> impl FilterBase2 {
    |                ^^^^^^^^^^^^^^^^
    |
    = note: hidden type `Map2<[closure@$DIR/issue-55608-captures-empty-region.rs:7:36: 7:41]>` captures an empty lifetime
diff --git a/src/test/ui/impl-trait/no-method-suggested-traits.stderr b/src/test/ui/impl-trait/no-method-suggested-traits.stderr
index a3b118efa62..d980d7cccad 100644
--- a/src/test/ui/impl-trait/no-method-suggested-traits.stderr
+++ b/src/test/ui/impl-trait/no-method-suggested-traits.stderr
@@ -220,19 +220,19 @@ LL |     std::rc::Rc::new(&mut Box::new(&Bar::X)).method3();
 error[E0599]: no method named `method3` found for type `usize` in the current scope
   --> $DIR/no-method-suggested-traits.rs:69:13
    |
-LL |     1_usize.method3(); //~ ERROR no method named
+LL |     1_usize.method3();
    |             ^^^^^^^
 
 error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&usize>>` in the current scope
   --> $DIR/no-method-suggested-traits.rs:70:47
    |
-LL |     std::rc::Rc::new(&mut Box::new(&1_usize)).method3(); //~ ERROR no method named
+LL |     std::rc::Rc::new(&mut Box::new(&1_usize)).method3();
    |                                               ^^^^^^^
 
 error[E0599]: no method named `method3` found for type `no_method_suggested_traits::Foo` in the current scope
   --> $DIR/no-method-suggested-traits.rs:71:37
    |
-LL |     no_method_suggested_traits::Foo.method3();  //~ ERROR no method named
+LL |     no_method_suggested_traits::Foo.method3();
    |                                     ^^^^^^^
 
 error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Foo>>` in the current scope
@@ -244,7 +244,7 @@ LL |     std::rc::Rc::new(&mut Box::new(&no_method_suggested_traits::Foo)).metho
 error[E0599]: no method named `method3` found for type `no_method_suggested_traits::Bar` in the current scope
   --> $DIR/no-method-suggested-traits.rs:74:40
    |
-LL |     no_method_suggested_traits::Bar::X.method3();  //~ ERROR no method named
+LL |     no_method_suggested_traits::Bar::X.method3();
    |                                        ^^^^^^^
 
 error[E0599]: no method named `method3` found for type `std::rc::Rc<&mut std::boxed::Box<&no_method_suggested_traits::Bar>>` in the current scope
diff --git a/src/test/ui/impl-trait/no-trait.stderr b/src/test/ui/impl-trait/no-trait.stderr
index 84ac1bd5ca4..3a636f2524f 100644
--- a/src/test/ui/impl-trait/no-trait.stderr
+++ b/src/test/ui/impl-trait/no-trait.stderr
@@ -1,7 +1,7 @@
 error: at least one trait must be specified
   --> $DIR/no-trait.rs:1:11
    |
-LL | fn f() -> impl 'static {} //~ ERROR at least one trait must be specified
+LL | fn f() -> impl 'static {}
    |           ^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/impl-trait/recursive-async-impl-trait-type.stderr b/src/test/ui/impl-trait/recursive-async-impl-trait-type.stderr
index acdeabb2f98..abc9ff54bde 100644
--- a/src/test/ui/impl-trait/recursive-async-impl-trait-type.stderr
+++ b/src/test/ui/impl-trait/recursive-async-impl-trait-type.stderr
@@ -1,7 +1,7 @@
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-async-impl-trait-type.rs:7:40
    |
-LL | async fn recursive_async_function() -> () { //~ ERROR
+LL | async fn recursive_async_function() -> () {
    |                                        ^^ expands to self-referential type
    |
    = note: expanded type is `std::future::GenFuture<[static generator@$DIR/recursive-async-impl-trait-type.rs:7:43: 9:2 {impl std::future::Future, ()}]>`
diff --git a/src/test/ui/impl-trait/recursive-impl-trait-type.stderr b/src/test/ui/impl-trait/recursive-impl-trait-type.stderr
index 96494229fd3..fce234eb87c 100644
--- a/src/test/ui/impl-trait/recursive-impl-trait-type.stderr
+++ b/src/test/ui/impl-trait/recursive-impl-trait-type.stderr
@@ -1,7 +1,7 @@
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:6:22
    |
-LL | fn option(i: i32) -> impl Sized { //~ ERROR
+LL | fn option(i: i32) -> impl Sized {
    |                      ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `std::option::Option<(impl Sized, i32)>`
@@ -9,7 +9,7 @@ LL | fn option(i: i32) -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:14:15
    |
-LL | fn tuple() -> impl Sized { //~ ERROR
+LL | fn tuple() -> impl Sized {
    |               ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `(impl Sized,)`
@@ -17,7 +17,7 @@ LL | fn tuple() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:18:15
    |
-LL | fn array() -> impl Sized { //~ ERROR
+LL | fn array() -> impl Sized {
    |               ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `[impl Sized; 1]`
@@ -25,7 +25,7 @@ LL | fn array() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:22:13
    |
-LL | fn ptr() -> impl Sized { //~ ERROR
+LL | fn ptr() -> impl Sized {
    |             ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `*const impl Sized`
@@ -33,7 +33,7 @@ LL | fn ptr() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:26:16
    |
-LL | fn fn_ptr() -> impl Sized { //~ ERROR
+LL | fn fn_ptr() -> impl Sized {
    |                ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `fn() -> impl Sized`
@@ -41,7 +41,7 @@ LL | fn fn_ptr() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:30:25
    |
-LL | fn closure_capture() -> impl Sized { //~ ERROR
+LL | fn closure_capture() -> impl Sized {
    |                         ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `[closure@$DIR/recursive-impl-trait-type.rs:32:5: 32:19 x:impl Sized]`
@@ -49,7 +49,7 @@ LL | fn closure_capture() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:35:29
    |
-LL | fn closure_ref_capture() -> impl Sized { //~ ERROR
+LL | fn closure_ref_capture() -> impl Sized {
    |                             ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `[closure@$DIR/recursive-impl-trait-type.rs:37:5: 37:20 x:impl Sized]`
@@ -57,7 +57,7 @@ LL | fn closure_ref_capture() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:40:21
    |
-LL | fn closure_sig() -> impl Sized { //~ ERROR
+LL | fn closure_sig() -> impl Sized {
    |                     ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `[closure@$DIR/recursive-impl-trait-type.rs:41:5: 41:21]`
@@ -65,7 +65,7 @@ LL | fn closure_sig() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:44:23
    |
-LL | fn generator_sig() -> impl Sized { //~ ERROR
+LL | fn generator_sig() -> impl Sized {
    |                       ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `[closure@$DIR/recursive-impl-trait-type.rs:45:5: 45:23]`
@@ -73,7 +73,7 @@ LL | fn generator_sig() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:48:27
    |
-LL | fn generator_capture() -> impl Sized { //~ ERROR
+LL | fn generator_capture() -> impl Sized {
    |                           ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `[generator@$DIR/recursive-impl-trait-type.rs:50:5: 50:26 x:impl Sized {()}]`
@@ -81,7 +81,7 @@ LL | fn generator_capture() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:53:26
    |
-LL | fn substs_change<T>() -> impl Sized { //~ ERROR
+LL | fn substs_change<T>() -> impl Sized {
    |                          ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `(impl Sized,)`
@@ -89,7 +89,7 @@ LL | fn substs_change<T>() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:57:24
    |
-LL | fn generator_hold() -> impl Sized { //~ ERROR
+LL | fn generator_hold() -> impl Sized {
    |                        ^^^^^^^^^^ expands to self-referential type
    |
    = note: expanded type is `[generator@$DIR/recursive-impl-trait-type.rs:58:5: 62:6 {impl Sized, ()}]`
@@ -97,7 +97,7 @@ LL | fn generator_hold() -> impl Sized { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:69:26
    |
-LL | fn mutual_recursion() -> impl Sync { //~ ERROR
+LL | fn mutual_recursion() -> impl Sync {
    |                          ^^^^^^^^^ expands to self-referential type
    |
    = note: type resolves to itself
@@ -105,7 +105,7 @@ LL | fn mutual_recursion() -> impl Sync { //~ ERROR
 error[E0720]: opaque type expands to a recursive type
   --> $DIR/recursive-impl-trait-type.rs:73:28
    |
-LL | fn mutual_recursion_b() -> impl Sized { //~ ERROR
+LL | fn mutual_recursion_b() -> impl Sized {
    |                            ^^^^^^^^^^ expands to self-referential type
    |
    = note: type resolves to itself
diff --git a/src/test/ui/impl-trait/universal-issue-48703.stderr b/src/test/ui/impl-trait/universal-issue-48703.stderr
index 920b44fc909..26ed8dbb9c7 100644
--- a/src/test/ui/impl-trait/universal-issue-48703.stderr
+++ b/src/test/ui/impl-trait/universal-issue-48703.stderr
@@ -1,7 +1,7 @@
 error[E0632]: cannot provide explicit type parameters when `impl Trait` is used in argument position.
   --> $DIR/universal-issue-48703.rs:8:5
    |
-LL |     foo::<String>('a'); //~ ERROR cannot provide explicit type parameters
+LL |     foo::<String>('a');
    |     ^^^^^^^^^^^^^
 
 error: aborting due to previous error
diff --git a/src/test/ui/impl-trait/universal-mismatched-type.stderr b/src/test/ui/impl-trait/universal-mismatched-type.stderr
index 55e1216d3a8..d223b9672cf 100644
--- a/src/test/ui/impl-trait/universal-mismatched-type.stderr
+++ b/src/test/ui/impl-trait/universal-mismatched-type.stderr
@@ -3,7 +3,7 @@ error[E0308]: mismatched types
    |
 LL | fn foo(x: impl Debug) -> String {
    |                          ------ expected `std::string::String` because of return type
-LL |     x //~ ERROR mismatched types
+LL |     x
    |     ^ expected struct `std::string::String`, found type parameter
    |
    = note: expected type `std::string::String`
diff --git a/src/test/ui/impl-trait/universal-two-impl-traits.stderr b/src/test/ui/impl-trait/universal-two-impl-traits.stderr
index 43bf2862fee..145d6a8431b 100644
--- a/src/test/ui/impl-trait/universal-two-impl-traits.stderr
+++ b/src/test/ui/impl-trait/universal-two-impl-traits.stderr
@@ -1,7 +1,7 @@
 error[E0308]: mismatched types
   --> $DIR/universal-two-impl-traits.rs:5:9
    |
-LL |     a = y; //~ ERROR mismatched
+LL |     a = y;
    |         ^ expected type parameter, found a different type parameter
    |
    = note: expected type `impl Debug` (type parameter)
diff --git a/src/test/ui/impl-trait/universal_wrong_bounds.stderr b/src/test/ui/impl-trait/universal_wrong_bounds.stderr
index f0b685bd5ee..1fd3ebff62a 100644
--- a/src/test/ui/impl-trait/universal_wrong_bounds.stderr
+++ b/src/test/ui/impl-trait/universal_wrong_bounds.stderr
@@ -1,7 +1,7 @@
 error[E0405]: cannot find trait `Debug` in this scope
   --> $DIR/universal_wrong_bounds.rs:9:24
    |
-LL | fn wants_debug(g: impl Debug) { } //~ ERROR cannot find
+LL | fn wants_debug(g: impl Debug) { }
    |                        ^^^^^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |
@@ -11,7 +11,7 @@ LL | use std::fmt::Debug;
 error[E0405]: cannot find trait `Debug` in this scope
   --> $DIR/universal_wrong_bounds.rs:10:26
    |
-LL | fn wants_display(g: impl Debug) { } //~ ERROR cannot find
+LL | fn wants_display(g: impl Debug) { }
    |                          ^^^^^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |