Update tests

9 files changed, 17 insertions, 17 deletions

diff --git a/src/test/ui/use/use-after-move-based-on-type.stderr b/src/test/ui/use/use-after-move-based-on-type.stderr
index 2282cdfad14..b9e0aaf1f84 100644
--- a/src/test/ui/use/use-after-move-based-on-type.stderr
+++ b/src/test/ui/use/use-after-move-based-on-type.stderr
@@ -3,7 +3,7 @@ error[E0382]: use of moved value: `x`
    |
 LL |     let _y = x;
    |         -- value moved here
-LL |     println!("{}", x); //~ ERROR use of moved value
+LL |     println!("{}", x);
    |                    ^ value used here after move
    |
    = note: move occurs because `x` has type `std::string::String`, which does not implement the `Copy` trait
diff --git a/src/test/ui/use/use-after-move-self-based-on-type.stderr b/src/test/ui/use/use-after-move-self-based-on-type.stderr
index a3acc1aad0f..d1d26069fdf 100644
--- a/src/test/ui/use/use-after-move-self-based-on-type.stderr
+++ b/src/test/ui/use/use-after-move-self-based-on-type.stderr
@@ -3,7 +3,7 @@ error[E0382]: use of moved value: `self.x`
    |
 LL |         self.bar();
    |         ---- value moved here
-LL |         return self.x;  //~ ERROR use of moved value: `self.x`
+LL |         return self.x;
    |                ^^^^^^ value used here after move
    |
    = note: move occurs because `self` has type `S`, which does not implement the `Copy` trait
diff --git a/src/test/ui/use/use-after-move-self.stderr b/src/test/ui/use/use-after-move-self.stderr
index 3cb77acaf3d..2c4bd202681 100644
--- a/src/test/ui/use/use-after-move-self.stderr
+++ b/src/test/ui/use/use-after-move-self.stderr
@@ -3,7 +3,7 @@ error[E0382]: use of moved value: `*self.x`
    |
 LL |         self.bar();
    |         ---- value moved here
-LL |         return *self.x;  //~ ERROR use of moved value: `*self.x`
+LL |         return *self.x;
    |                ^^^^^^^ value used here after move
    |
    = note: move occurs because `self` has type `S`, which does not implement the `Copy` trait
diff --git a/src/test/ui/use/use-from-trait-xc.stderr b/src/test/ui/use/use-from-trait-xc.stderr
index 8ff75b503d5..97dc603f9eb 100644
--- a/src/test/ui/use/use-from-trait-xc.stderr
+++ b/src/test/ui/use/use-from-trait-xc.stderr
@@ -19,13 +19,13 @@ LL | use use_from_trait_xc::Trait::CONST;
 error[E0432]: unresolved import `use_from_trait_xc::Foo`
   --> $DIR/use-from-trait-xc.rs:14:24
    |
-LL | use use_from_trait_xc::Foo::new; //~ ERROR struct `Foo` is private
+LL | use use_from_trait_xc::Foo::new;
    |                        ^^^ not a module `Foo`
 
 error[E0432]: unresolved import `use_from_trait_xc::Foo`
   --> $DIR/use-from-trait-xc.rs:17:24
    |
-LL | use use_from_trait_xc::Foo::C; //~ ERROR struct `Foo` is private
+LL | use use_from_trait_xc::Foo::C;
    |                        ^^^ not a module `Foo`
 
 error[E0432]: unresolved import `use_from_trait_xc::Bar`
@@ -43,13 +43,13 @@ LL | use use_from_trait_xc::Baz::new as baznew;
 error[E0603]: struct `Foo` is private
   --> $DIR/use-from-trait-xc.rs:14:24
    |
-LL | use use_from_trait_xc::Foo::new; //~ ERROR struct `Foo` is private
+LL | use use_from_trait_xc::Foo::new;
    |                        ^^^
 
 error[E0603]: struct `Foo` is private
   --> $DIR/use-from-trait-xc.rs:17:24
    |
-LL | use use_from_trait_xc::Foo::C; //~ ERROR struct `Foo` is private
+LL | use use_from_trait_xc::Foo::C;
    |                        ^^^
 
 error: aborting due to 9 previous errors
diff --git a/src/test/ui/use/use-mod/use-mod-3.stderr b/src/test/ui/use/use-mod/use-mod-3.stderr
index c644ec752f9..0c800ec35e4 100644
--- a/src/test/ui/use/use-mod/use-mod-3.stderr
+++ b/src/test/ui/use/use-mod/use-mod-3.stderr
@@ -1,13 +1,13 @@
 error[E0603]: module `bar` is private
   --> $DIR/use-mod-3.rs:1:10
    |
-LL | use foo::bar::{ //~ ERROR module `bar` is private
+LL | use foo::bar::{
    |          ^^^
 
 error[E0603]: module `bar` is private
   --> $DIR/use-mod-3.rs:4:10
    |
-LL | use foo::bar::{ //~ ERROR module `bar` is private
+LL | use foo::bar::{
    |          ^^^
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/use/use-mod/use-mod-4.stderr b/src/test/ui/use/use-mod/use-mod-4.stderr
index fc0f8952c47..99f5c352184 100644
--- a/src/test/ui/use/use-mod/use-mod-4.stderr
+++ b/src/test/ui/use/use-mod/use-mod-4.stderr
@@ -1,7 +1,7 @@
 error[E0429]: `self` imports are only allowed within a { } list
   --> $DIR/use-mod-4.rs:1:5
    |
-LL | use foo::self; //~ ERROR unresolved import `foo`
+LL | use foo::self;
    |     ^^^^^^^^^
 
 error[E0429]: `self` imports are only allowed within a { } list
@@ -13,7 +13,7 @@ LL | use std::mem::self;
 error[E0432]: unresolved import `foo`
   --> $DIR/use-mod-4.rs:1:5
    |
-LL | use foo::self; //~ ERROR unresolved import `foo`
+LL | use foo::self;
    |     ^^^ maybe a missing `extern crate foo;`?
 
 error: aborting due to 3 previous errors
diff --git a/src/test/ui/use/use-paths-as-items.stderr b/src/test/ui/use/use-paths-as-items.stderr
index 00f468cdf31..334e145098b 100644
--- a/src/test/ui/use/use-paths-as-items.stderr
+++ b/src/test/ui/use/use-paths-as-items.stderr
@@ -3,7 +3,7 @@ error[E0252]: the name `mem` is defined multiple times
    |
 LL | use std::{mem, ptr};
    |           --- previous import of the module `mem` here
-LL | use std::mem; //~ ERROR the name `mem` is defined multiple times
+LL | use std::mem;
    | ----^^^^^^^^-
    | |   |
    | |   `mem` reimported here
diff --git a/src/test/ui/use/use-self-type.stderr b/src/test/ui/use/use-self-type.stderr
index 50b4cdf357d..38c09c2be76 100644
--- a/src/test/ui/use/use-self-type.stderr
+++ b/src/test/ui/use/use-self-type.stderr
@@ -1,13 +1,13 @@
 error[E0433]: failed to resolve: use of undeclared type or module `Self`
   --> $DIR/use-self-type.rs:7:16
    |
-LL |         pub(in Self::f) struct Z; //~ ERROR use of undeclared type or module `Self`
+LL |         pub(in Self::f) struct Z;
    |                ^^^^ use of undeclared type or module `Self`
 
 error[E0432]: unresolved import `Self`
   --> $DIR/use-self-type.rs:6:13
    |
-LL |         use Self::f; //~ ERROR unresolved import
+LL |         use Self::f;
    |             ^^^^ use of undeclared type or module `Self`
 
 error: aborting due to 2 previous errors
diff --git a/src/test/ui/use/use-super-global-path.stderr b/src/test/ui/use/use-super-global-path.stderr
index ee7deb264df..a513d37738d 100644
--- a/src/test/ui/use/use-super-global-path.stderr
+++ b/src/test/ui/use/use-super-global-path.stderr
@@ -1,19 +1,19 @@
 error[E0433]: failed to resolve: global paths cannot start with `super`
   --> $DIR/use-super-global-path.rs:7:11
    |
-LL |     use ::super::{S, Z}; //~ ERROR global paths cannot start with `super`
+LL |     use ::super::{S, Z};
    |           ^^^^^ global paths cannot start with `super`
 
 error[E0433]: failed to resolve: global paths cannot start with `super`
   --> $DIR/use-super-global-path.rs:10:15
    |
-LL |         use ::super::main; //~ ERROR global paths cannot start with `super`
+LL |         use ::super::main;
    |               ^^^^^ global paths cannot start with `super`
 
 error[E0425]: cannot find function `main` in this scope
   --> $DIR/use-super-global-path.rs:11:9
    |
-LL |         main(); //~ ERROR cannot find function `main` in this scope
+LL |         main();
    |         ^^^^ not found in this scope
 help: possible candidate is found in another module, you can import it into scope
    |