bless tests

b-naber · b-naber · commit c0f41d435792 · 2025-06-23T17:48:56.000Z
diff --git a/tests/ui/imports/ambiguous-17.rs b/tests/ui/imports/ambiguous-17.rs
@@ -1,7 +1,8 @@
 //@ check-pass
 // https://github.com/rust-lang/rust/pull/113099#issuecomment-1638206152
 
-pub use evp::*; //~ WARNING ambiguous glob re-exports
+pub use evp::*;
+//~^ WARNING ambiguous glob re-exports
 pub use handwritten::*;
 
 macro_rules! m {
diff --git a/tests/ui/imports/ambiguous-17.stderr b/tests/ui/imports/ambiguous-17.stderr
@@ -3,13 +3,14 @@ warning: ambiguous glob re-exports
    |
 LL | pub use evp::*;
    |         ^^^^^^ the name `id` in the value namespace is first re-exported here
+LL |
 LL | pub use handwritten::*;
    |         -------------- but the name `id` in the value namespace is also re-exported here
    |
    = note: `#[warn(ambiguous_glob_reexports)]` on by default
 
 warning: `id` is ambiguous
-  --> $DIR/ambiguous-17.rs:26:5
+  --> $DIR/ambiguous-17.rs:27:5
    |
 LL |     id();
    |     ^^ ambiguous name
@@ -24,7 +25,7 @@ LL | pub use evp::*;
    |         ^^^^^^
    = help: consider adding an explicit import of `id` to disambiguate
 note: `id` could also refer to the function imported here
-  --> $DIR/ambiguous-17.rs:5:9
+  --> $DIR/ambiguous-17.rs:6:9
    |
 LL | pub use handwritten::*;
    |         ^^^^^^^^^^^^^^
diff --git a/tests/ui/imports/ambiguous-4-extern.rs b/tests/ui/imports/ambiguous-4-extern.rs
@@ -3,11 +3,12 @@
 
 macro_rules! m {
     () => {
-      pub fn id() {}
+        pub fn id() {}
     };
 }
 
-pub use evp::*; //~ WARNING ambiguous glob re-exports
+pub use evp::*;
+//~^ WARNING ambiguous glob re-exports
 pub use handwritten::*;
 
 mod evp {
diff --git a/tests/ui/imports/ambiguous-4-extern.stderr b/tests/ui/imports/ambiguous-4-extern.stderr
@@ -3,13 +3,14 @@ warning: ambiguous glob re-exports
    |
 LL | pub use evp::*;
    |         ^^^^^^ the name `id` in the value namespace is first re-exported here
+LL |
 LL | pub use handwritten::*;
    |         -------------- but the name `id` in the value namespace is also re-exported here
    |
    = note: `#[warn(ambiguous_glob_reexports)]` on by default
 
 warning: `id` is ambiguous
-  --> $DIR/ambiguous-4-extern.rs:23:5
+  --> $DIR/ambiguous-4-extern.rs:24:5
    |
 LL |     id();
    |     ^^ ambiguous name
@@ -24,7 +25,7 @@ LL | pub use evp::*;
    |         ^^^^^^
    = help: consider adding an explicit import of `id` to disambiguate
 note: `id` could also refer to the function imported here
-  --> $DIR/ambiguous-4-extern.rs:11:9
+  --> $DIR/ambiguous-4-extern.rs:12:9
    |
 LL | pub use handwritten::*;
    |         ^^^^^^^^^^^^^^
diff --git a/tests/ui/imports/ambiguous-9.rs b/tests/ui/imports/ambiguous-9.rs
@@ -5,15 +5,17 @@ pub mod dsl {
     mod range {
         pub fn date_range() {}
     }
-    pub use self::range::*; //~ WARNING ambiguous glob re-exports
+    pub use self::range::*;
+    //~^ WARNING ambiguous glob re-exports
     use super::prelude::*;
 }
 
 pub mod prelude {
     mod t {
       pub fn date_range() {}
     }
-    pub use self::t::*; //~ WARNING ambiguous glob re-exports
+    pub use self::t::*;
+    //~^ WARNING ambiguous glob re-exports
     pub use super::dsl::*;
 }
 
diff --git a/tests/ui/imports/ambiguous-9.stderr b/tests/ui/imports/ambiguous-9.stderr
@@ -3,13 +3,14 @@ warning: ambiguous glob re-exports
    |
 LL |     pub use self::range::*;
    |             ^^^^^^^^^^^^^^ the name `date_range` in the value namespace is first re-exported here
+LL |
 LL |     use super::prelude::*;
    |         ----------------- but the name `date_range` in the value namespace is also re-exported here
    |
    = note: `#[warn(ambiguous_glob_reexports)]` on by default
 
 warning: `date_range` is ambiguous
-  --> $DIR/ambiguous-9.rs:24:5
+  --> $DIR/ambiguous-9.rs:26:5
    |
 LL |     date_range();
    |     ^^^^^^^^^^ ambiguous name
@@ -24,23 +25,24 @@ LL |     pub use self::range::*;
    |             ^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
 note: `date_range` could also refer to the function imported here
-  --> $DIR/ambiguous-9.rs:9:9
+  --> $DIR/ambiguous-9.rs:10:9
    |
 LL |     use super::prelude::*;
    |         ^^^^^^^^^^^^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
    = note: `#[warn(ambiguous_glob_imports)]` on by default
 
 warning: ambiguous glob re-exports
-  --> $DIR/ambiguous-9.rs:16:13
+  --> $DIR/ambiguous-9.rs:17:13
    |
 LL |     pub use self::t::*;
    |             ^^^^^^^^^^ the name `date_range` in the value namespace is first re-exported here
+LL |
 LL |     pub use super::dsl::*;
    |             ------------- but the name `date_range` in the value namespace is also re-exported here
 
 warning: `date_range` is ambiguous
-  --> $DIR/ambiguous-9.rs:24:5
+  --> $DIR/ambiguous-9.rs:26:5
    |
 LL |     date_range();
    |     ^^^^^^^^^^ ambiguous name
@@ -49,13 +51,13 @@ LL |     date_range();
    = note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `date_range` could refer to the function imported here
-  --> $DIR/ambiguous-9.rs:20:5
+  --> $DIR/ambiguous-9.rs:22:5
    |
 LL | use dsl::*;
    |     ^^^^^^
    = help: consider adding an explicit import of `date_range` to disambiguate
 note: `date_range` could also refer to the function imported here
-  --> $DIR/ambiguous-9.rs:21:5
+  --> $DIR/ambiguous-9.rs:23:5
    |
 LL | use prelude::*;
    |     ^^^^^^^^^^
diff --git a/tests/ui/imports/issue-56125.rs b/tests/ui/imports/issue-56125.rs
@@ -15,7 +15,7 @@ mod m2 {
 mod m3 {
     mod empty {}
     use empty::issue_56125; //~ ERROR unresolved import `empty::issue_56125`
-    use issue_56125::*; //~ ERROR `issue_56125` is ambiguous
+    use issue_56125::*;
 }
 
 fn main() {}
diff --git a/tests/ui/imports/issue-56125.stderr b/tests/ui/imports/issue-56125.stderr
@@ -54,24 +54,7 @@ LL |     use issue_56125::non_last_segment::non_last_segment::*;
    = help: consider adding an explicit import of `issue_56125` to disambiguate
    = help: or use `self::issue_56125` to refer to this module unambiguously
 
-error[E0659]: `issue_56125` is ambiguous
-  --> $DIR/issue-56125.rs:18:9
-   |
-LL |     use issue_56125::*;
-   |         ^^^^^^^^^^^ ambiguous name
-   |
-   = note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
-   = note: `issue_56125` could refer to a crate passed with `--extern`
-   = help: use `::issue_56125` to refer to this crate unambiguously
-note: `issue_56125` could also refer to the module imported here
-  --> $DIR/issue-56125.rs:18:9
-   |
-LL |     use issue_56125::*;
-   |         ^^^^^^^^^^^^^^
-   = help: consider adding an explicit import of `issue_56125` to disambiguate
-   = help: or use `self::issue_56125` to refer to this module unambiguously
-
-error: aborting due to 4 previous errors
+error: aborting due to 3 previous errors
 
 Some errors have detailed explanations: E0432, E0659.
 For more information about an error, try `rustc --explain E0432`.
diff --git a/tests/ui/imports/shadow-glob-module-resolution-2.rs b/tests/ui/imports/shadow-glob-module-resolution-2.rs
@@ -13,7 +13,5 @@ use a::*;
 use e as b;
 //~^ ERROR: unresolved import `e`
 use b::c::D as e;
-//~^ ERROR: cannot determine resolution for the import
-//~| ERROR: cannot determine resolution for the import
 
 fn main() { }
diff --git a/tests/ui/imports/shadow-glob-module-resolution-2.stderr b/tests/ui/imports/shadow-glob-module-resolution-2.stderr
@@ -1,17 +1,3 @@
-error: cannot determine resolution for the import
-  --> $DIR/shadow-glob-module-resolution-2.rs:15:5
-   |
-LL | use b::c::D as e;
-   |     ^^^^^^^^^^^^
-
-error: cannot determine resolution for the import
-  --> $DIR/shadow-glob-module-resolution-2.rs:15:5
-   |
-LL | use b::c::D as e;
-   |     ^^^^^^^^^^^^
-   |
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-
 error[E0432]: unresolved import `e`
   --> $DIR/shadow-glob-module-resolution-2.rs:13:5
    |
@@ -21,6 +7,6 @@ LL | use e as b;
    |     no `e` in the root
    |     help: a similar name exists in the module: `a`
 
-error: aborting due to 3 previous errors
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0432`.
diff --git a/tests/ui/imports/shadow-glob-module-resolution-4.rs b/tests/ui/imports/shadow-glob-module-resolution-4.rs
@@ -12,8 +12,6 @@ use e as b;
 
 use b::C as e;
 //~^ ERROR: unresolved import `b::C`
-//~| ERROR: cannot determine resolution for the import
-//~| ERROR: cannot determine resolution for the import
 
 fn e() {}
 
diff --git a/tests/ui/imports/shadow-glob-module-resolution-4.stderr b/tests/ui/imports/shadow-glob-module-resolution-4.stderr
@@ -1,23 +1,9 @@
-error: cannot determine resolution for the import
-  --> $DIR/shadow-glob-module-resolution-4.rs:13:5
-   |
-LL | use b::C as e;
-   |     ^^^^^^^^^
-
-error: cannot determine resolution for the import
-  --> $DIR/shadow-glob-module-resolution-4.rs:13:5
-   |
-LL | use b::C as e;
-   |     ^^^^^^^^^
-   |
-   = note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
-
 error[E0432]: unresolved import `b::C`
   --> $DIR/shadow-glob-module-resolution-4.rs:13:5
    |
 LL | use b::C as e;
    |     ^^^^^^^^^
 
-error: aborting due to 3 previous errors
+error: aborting due to 1 previous error
 
 For more information about this error, try `rustc --explain E0432`.
diff --git a/tests/ui/resolve/issue-107563-ambiguous-glob-reexports.rs b/tests/ui/resolve/issue-107563-ambiguous-glob-reexports.rs
@@ -14,8 +14,12 @@ pub use foo::*;
 pub use bar::*;
 
 mod ambiguous {
-    mod m1 { pub type A = u8; }
-    mod m2 { pub type A = u8; }
+    mod m1 {
+        pub type A = u8;
+    }
+    mod m2 {
+        pub type A = u8;
+    }
     pub use self::m1::*;
     //~^ ERROR ambiguous glob re-exports
     pub use self::m2::*;
diff --git a/tests/ui/resolve/issue-107563-ambiguous-glob-reexports.stderr b/tests/ui/resolve/issue-107563-ambiguous-glob-reexports.stderr
@@ -1,18 +1,18 @@
 error[E0659]: `A` is ambiguous
-  --> $DIR/issue-107563-ambiguous-glob-reexports.rs:25:24
+  --> $DIR/issue-107563-ambiguous-glob-reexports.rs:29:24
    |
 LL |     pub use ambiguous::A;
    |                        ^ ambiguous name
    |
    = note: ambiguous because of multiple glob imports of a name in the same module
 note: `A` could refer to the type alias imported here
-  --> $DIR/issue-107563-ambiguous-glob-reexports.rs:19:13
+  --> $DIR/issue-107563-ambiguous-glob-reexports.rs:23:13
    |
 LL |     pub use self::m1::*;
    |             ^^^^^^^^^^^
    = help: consider adding an explicit import of `A` to disambiguate
 note: `A` could also refer to the type alias imported here
-  --> $DIR/issue-107563-ambiguous-glob-reexports.rs:21:13
+  --> $DIR/issue-107563-ambiguous-glob-reexports.rs:25:13
    |
 LL |     pub use self::m2::*;
    |             ^^^^^^^^^^^
@@ -34,7 +34,7 @@ LL | #![deny(ambiguous_glob_reexports)]
    |         ^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: ambiguous glob re-exports
-  --> $DIR/issue-107563-ambiguous-glob-reexports.rs:19:13
+  --> $DIR/issue-107563-ambiguous-glob-reexports.rs:23:13
    |
 LL |     pub use self::m1::*;
    |             ^^^^^^^^^^^ the name `A` in the type namespace is first re-exported here

Original file line number	Diff line number	Diff line change
`@@ -3,13 +3,14 @@ warning: ambiguous glob re-exports`
`3`	`3`	`\|`
`4`	`4`	`LL \| pub use evp::*;`
`5`	`5`	\| ^^^^^^ the name `id` in the value namespace is first re-exported here
	`6`	`+LL \|`
`6`	`7`	`LL \| pub use handwritten::*;`
`7`	`8`	\| -------------- but the name `id` in the value namespace is also re-exported here
`8`	`9`	`\|`
`9`	`10`	= note: `#[warn(ambiguous_glob_reexports)]` on by default
`10`	`11`
`11`	`12`	warning: `id` is ambiguous
`12`		`- --> $DIR/ambiguous-17.rs:26:5`
	`13`	`+ --> $DIR/ambiguous-17.rs:27:5`
`13`	`14`	`\|`
`14`	`15`	`LL \| id();`
`15`	`16`	`\| ^^ ambiguous name`
`@@ -24,7 +25,7 @@ LL \| pub use evp::*;`
`24`	`25`	`\| ^^^^^^`
`25`	`26`	= help: consider adding an explicit import of `id` to disambiguate
`26`	`27`	note: `id` could also refer to the function imported here
`27`		`- --> $DIR/ambiguous-17.rs:5:9`
	`28`	`+ --> $DIR/ambiguous-17.rs:6:9`
`28`	`29`	`\|`
`29`	`30`	`LL \| pub use handwritten::*;`
`30`	`31`	`\| ^^^^^^^^^^^^^^`
Original file line number	Diff line number	Diff line change
`@@ -5,15 +5,17 @@ pub mod dsl {`
`5`	`5`	`mod range {`
`6`	`6`	`pub fn date_range() {}`
`7`	`7`	`}`
`8`		`- pub use self::range::*; //~ WARNING ambiguous glob re-exports`
	`8`	`+ pub use self::range::*;`
	`9`	`+ //~^ WARNING ambiguous glob re-exports`
`9`	`10`	`use super::prelude::*;`
`10`	`11`	`}`
`11`	`12`
`12`	`13`	`pub mod prelude {`
`13`	`14`	`mod t {`
`14`	`15`	`pub fn date_range() {}`
`15`	`16`	`}`
`16`		`- pub use self::t::*; //~ WARNING ambiguous glob re-exports`
	`17`	`+ pub use self::t::*;`
	`18`	`+ //~^ WARNING ambiguous glob re-exports`
`17`	`19`	`pub use super::dsl::*;`
`18`	`20`	`}`
`19`	`21`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ mod m2 {`
`15`	`15`	`mod m3 {`
`16`	`16`	`mod empty {}`
`17`	`17`	use empty::issue_56125; //~ ERROR unresolved import `empty::issue_56125`
`18`		- use issue_56125::*; //~ ERROR `issue_56125` is ambiguous
	`18`	`+ use issue_56125::*;`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`fn main() {}`