bless tests

Author: LorrensP-2158466

tests/ui/feature-gates/feature-gate-import-trait-associated-functions.stderr

@@ -18,16 +18,6 @@ LL | use A::{DEFAULT, new};
    = help: add `#![feature(import_trait_associated_functions)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
-error[E0658]: `use` associated items of traits is unstable
-  --> $DIR/feature-gate-import-trait-associated-functions.rs:7:5
-   |
-LL | use Default::default;
-   |     ^^^^^^^^^^^^^^^^
-   |
-   = note: see issue #134691 <https://github.com/rust-lang/rust/issues/134691> for more information
-   = help: add `#![feature(import_trait_associated_functions)]` to the crate attributes to enable
-   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
-
 error[E0658]: `use` associated items of traits is unstable
   --> $DIR/feature-gate-import-trait-associated-functions.rs:27:26
    |
@@ -58,6 +48,16 @@ LL | use Glob::*;
    = help: add `#![feature(import_trait_associated_functions)]` to the crate attributes to enable
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
+error[E0658]: `use` associated items of traits is unstable
+  --> $DIR/feature-gate-import-trait-associated-functions.rs:7:5
+   |
+LL | use Default::default;
+   |     ^^^^^^^^^^^^^^^^
+   |
+   = note: see issue #134691 <https://github.com/rust-lang/rust/issues/134691> for more information
+   = help: add `#![feature(import_trait_associated_functions)]` to the crate attributes to enable
+   = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
+
 error: aborting due to 6 previous errors
 
 For more information about this error, try `rustc --explain E0658`.

tests/ui/imports/reexports.stderr

@@ -11,33 +11,33 @@ LL |         pub use super::foo;
    |                 ^^^^^^^^^^
 
 error[E0603]: module import `foo` is private
-  --> $DIR/reexports.rs:36:22
+  --> $DIR/reexports.rs:37:22
    |
-LL |     use crate::b::a::foo::S;
+LL |     use crate::b::b::foo::S as T;
    |                      ^^^ private module import
    |
 note: the module import `foo` is defined here...
-  --> $DIR/reexports.rs:24:17
+  --> $DIR/reexports.rs:29:17
    |
-LL |         pub use super::foo; // This is OK since the value `foo` is visible enough.
-   |                 ^^^^^^^^^^
+LL |         pub use super::*; // This is also OK since the value `foo` is visible enough.
+   |                 ^^^^^^^^
 note: ...and refers to the module `foo` which is defined here
   --> $DIR/reexports.rs:19:5
    |
 LL |     mod foo {
    |     ^^^^^^^
 
 error[E0603]: module import `foo` is private
-  --> $DIR/reexports.rs:37:22
+  --> $DIR/reexports.rs:36:22
    |
-LL |     use crate::b::b::foo::S as T;
+LL |     use crate::b::a::foo::S;
    |                      ^^^ private module import
    |
 note: the module import `foo` is defined here...
-  --> $DIR/reexports.rs:29:17
+  --> $DIR/reexports.rs:24:17
    |
-LL |         pub use super::*; // This is also OK since the value `foo` is visible enough.
-   |                 ^^^^^^^^
+LL |         pub use super::foo; // This is OK since the value `foo` is visible enough.
+   |                 ^^^^^^^^^^
 note: ...and refers to the module `foo` which is defined here
   --> $DIR/reexports.rs:19:5
    |

tests/ui/shadowed/shadowed-use-visibility.stderr

@@ -1,31 +1,31 @@
-error[E0603]: module import `bar` is private
-  --> $DIR/shadowed-use-visibility.rs:9:21
+error[E0603]: module import `f` is private
+  --> $DIR/shadowed-use-visibility.rs:15:10
    |
-LL |     use crate::foo::bar::f as g;
-   |                     ^^^ private module import
+LL | use bar::f::f;
+   |          ^ private module import
    |
-note: the module import `bar` is defined here...
-  --> $DIR/shadowed-use-visibility.rs:4:9
+note: the module import `f` is defined here...
+  --> $DIR/shadowed-use-visibility.rs:11:9
    |
-LL |     use crate::foo as bar;
-   |         ^^^^^^^^^^^^^^^^^
+LL |     use crate::foo as f;
+   |         ^^^^^^^^^^^^^^^
 note: ...and refers to the module `foo` which is defined here
   --> $DIR/shadowed-use-visibility.rs:1:1
    |
 LL | mod foo {
    | ^^^^^^^
 
-error[E0603]: module import `f` is private
-  --> $DIR/shadowed-use-visibility.rs:15:10
+error[E0603]: module import `bar` is private
+  --> $DIR/shadowed-use-visibility.rs:9:21
    |
-LL | use bar::f::f;
-   |          ^ private module import
+LL |     use crate::foo::bar::f as g;
+   |                     ^^^ private module import
    |
-note: the module import `f` is defined here...
-  --> $DIR/shadowed-use-visibility.rs:11:9
+note: the module import `bar` is defined here...
+  --> $DIR/shadowed-use-visibility.rs:4:9
    |
-LL |     use crate::foo as f;
-   |         ^^^^^^^^^^^^^^^
+LL |     use crate::foo as bar;
+   |         ^^^^^^^^^^^^^^^^^
 note: ...and refers to the module `foo` which is defined here
   --> $DIR/shadowed-use-visibility.rs:1:1
    |