Bless other tests

Author: mu001999

tests/ui/delegation/target-expr-pass.rs

@@ -25,7 +25,7 @@ struct S(F); //~ WARN struct `S` is never constructed
 impl Trait for S {
     reuse <F as Trait>::bar {
         #[allow(unused_imports)]
-        use self::to_reuse::{foo, inner::self};
+        use self::to_reuse::{foo, inner::{self}};
         let x = foo(12);
         assert_eq!(x, 12);
         &self.0

tests/ui/dollar-crate/dollar-crate-is-keyword-2.rs

@@ -2,7 +2,7 @@ mod a {}
 
 macro_rules! m {
     () => {
-        use a::$crate; //~ ERROR unresolved import `a::$crate`
+        use a::$crate; //~ ERROR `$crate` in paths can only be used in start position
         use a::$crate::b; //~ ERROR `$crate` in paths can only be used in start position
         type A = a::$crate; //~ ERROR `$crate` in paths can only be used in start position
     }

tests/ui/dollar-crate/dollar-crate-is-keyword-2.stderr

@@ -1,19 +1,19 @@
-error[E0433]: failed to resolve: `$crate` in paths can only be used in start position
-  --> $DIR/dollar-crate-is-keyword-2.rs:6:16
+error: `$crate` in paths can only be used in start position
+  --> $DIR/dollar-crate-is-keyword-2.rs:5:16
    |
-LL |         use a::$crate::b;
-   |                ^^^^^^ `$crate` in paths can only be used in start position
+LL |         use a::$crate;
+   |                ^^^^^^
 ...
 LL | m!();
    | ---- in this macro invocation
    |
    = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
 
-error[E0432]: unresolved import `a::$crate`
-  --> $DIR/dollar-crate-is-keyword-2.rs:5:13
+error[E0433]: failed to resolve: `$crate` in paths can only be used in start position
+  --> $DIR/dollar-crate-is-keyword-2.rs:6:16
    |
-LL |         use a::$crate;
-   |             ^^^^^^^^^ no `$crate` in `a`
+LL |         use a::$crate::b;
+   |                ^^^^^^ `$crate` in paths can only be used in start position
 ...
 LL | m!();
    | ---- in this macro invocation
@@ -33,5 +33,4 @@ LL | m!();
 
 error: aborting due to 3 previous errors
 
-Some errors have detailed explanations: E0432, E0433.
-For more information about an error, try `rustc --explain E0432`.
+For more information about this error, try `rustc --explain E0433`.

tests/ui/dollar-crate/dollar-crate-is-keyword.stderr

@@ -21,21 +21,21 @@ LL | m!();
    = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `$crate` may not be imported
-  --> $DIR/dollar-crate-is-keyword.rs:9:9
+  --> $DIR/dollar-crate-is-keyword.rs:9:13
    |
 LL |         use $crate;
-   |         ^^^^^^^^^^^
+   |             ^^^^^^
 ...
 LL | m!();
    | ---- in this macro invocation
    |
    = note: this error originates in the macro `m` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error: `$crate` may not be imported
-  --> $DIR/dollar-crate-is-keyword.rs:10:9
+  --> $DIR/dollar-crate-is-keyword.rs:10:23
    |
 LL |         use $crate as $crate;
-   |         ^^^^^^^^^^^^^^^^^^^^^
+   |                       ^^^^^^
 ...
 LL | m!();
    | ---- in this macro invocation

tests/ui/error-codes/E0430.rs

@@ -1,5 +1,4 @@
-use std::fmt::{self, self}; //~ ERROR E0430
-                            //~^ ERROR E0252
+use std::fmt::{self, self}; //~ ERROR the name `fmt` is defined multiple times
 
 fn main () {
 }

tests/ui/error-codes/E0430.stderr

@@ -1,11 +1,3 @@
-error[E0430]: `self` import can only appear once in an import list
-  --> $DIR/E0430.rs:1:16
-   |
-LL | use std::fmt::{self, self};
-   |                ^^^^  ---- another `self` import appears here
-   |                |
-   |                can only appear once in an import list
-
 error[E0252]: the name `fmt` is defined multiple times
   --> $DIR/E0430.rs:1:22
    |
@@ -16,7 +8,6 @@ LL | use std::fmt::{self, self};
    |
    = note: `fmt` must be defined only once in the type namespace of this module
 
-error: aborting due to 2 previous errors
+error: aborting due to 1 previous error
 
-Some errors have detailed explanations: E0252, E0430.
-For more information about an error, try `rustc --explain E0252`.
+For more information about this error, try `rustc --explain E0252`.

tests/ui/error-codes/E0431.rs

@@ -1,4 +1,4 @@
-use {self}; //~ ERROR E0431
+use {self}; //~ ERROR imports need to be explicitly named
 
 fn main () {
 }

tests/ui/error-codes/E0431.stderr

@@ -1,9 +1,13 @@
-error[E0431]: `self` import can only appear in an import list with a non-empty prefix
+error: imports need to be explicitly named
   --> $DIR/E0431.rs:1:6
    |
 LL | use {self};
-   |      ^^^^ can only appear in an import list with a non-empty prefix
+   |      ^^^^
+   |
+help: try renaming it with a name
+   |
+LL | use {self as name};
+   |           +++++++
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0431`.

tests/ui/imports/issue-47623.rs

@@ -1,3 +1,3 @@
-use self; //~ERROR `self` imports are only allowed within a { } list
+use self; //~ERROR imports need to be explicitly named
 
 fn main() {}

tests/ui/imports/issue-47623.stderr

@@ -1,9 +1,8 @@
-error[E0429]: `self` imports are only allowed within a { } list
+error: imports need to be explicitly named
   --> $DIR/issue-47623.rs:1:5
    |
 LL | use self;
    |     ^^^^
 
 error: aborting due to 1 previous error
 
-For more information about this error, try `rustc --explain E0429`.