Skip to content

Commit 9c91fb1

Browse files
LorrensP-2158466LorrensP-2158466
committed
bless tests
1 parent f0159e8 commit 9c91fb1

14 files changed

+46
-83
lines changed

‎tests/ui/imports/ambiguous-17.rs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
// https://github.com/rust-lang/rust/pull/113099#issuecomment-1638206152
22

3-
pub use evp::*; //~ WARNING ambiguous glob re-exports
3+
pub use evp::*;
4+
//~^ WARNING ambiguous glob re-exports
45
pub use handwritten::*;
56

67
macro_rules! m {

‎tests/ui/imports/ambiguous-17.stderr‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ warning: ambiguous glob re-exports
33
|
44
LL | pub use evp::*;
55
| ^^^^^^ the name `id` in the value namespace is first re-exported here
6+
LL |
67
LL | pub use handwritten::*;
78
| -------------- but the name `id` in the value namespace is also re-exported here
89
|
910
= note: `#[warn(ambiguous_glob_reexports)]` on by default
1011

1112
error: `id` is ambiguous
12-
--> $DIR/ambiguous-17.rs:25:5
13+
--> $DIR/ambiguous-17.rs:26:5
1314
|
1415
LL | id();
1516
| ^^ ambiguous name
@@ -24,7 +25,7 @@ LL | pub use evp::*;
2425
| ^^^^^^
2526
= help: consider adding an explicit import of `id` to disambiguate
2627
note: `id` could also refer to the function imported here
27-
--> $DIR/ambiguous-17.rs:4:9
28+
--> $DIR/ambiguous-17.rs:5:9
2829
|
2930
LL | pub use handwritten::*;
3031
| ^^^^^^^^^^^^^^
@@ -35,7 +36,7 @@ error: aborting due to 1 previous error; 1 warning emitted
3536

3637
Future incompatibility report: Future breakage diagnostic:
3738
error: `id` is ambiguous
38-
--> $DIR/ambiguous-17.rs:25:5
39+
--> $DIR/ambiguous-17.rs:26:5
3940
|
4041
LL | id();
4142
| ^^ ambiguous name
@@ -50,7 +51,7 @@ LL | pub use evp::*;
5051
| ^^^^^^
5152
= help: consider adding an explicit import of `id` to disambiguate
5253
note: `id` could also refer to the function imported here
53-
--> $DIR/ambiguous-17.rs:4:9
54+
--> $DIR/ambiguous-17.rs:5:9
5455
|
5556
LL | pub use handwritten::*;
5657
| ^^^^^^^^^^^^^^

‎tests/ui/imports/ambiguous-4-extern.rs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@
55

66
macro_rules! m {
77
() => {
8-
pub fn id() {}
8+
pub fn id() {}
99
};
1010
}
1111

12-
pub use evp::*; //~ WARNING ambiguous glob re-exports
12+
pub use evp::*;
13+
//~^ WARNING ambiguous glob re-exports
1314
pub use handwritten::*;
1415

1516
mod evp {

‎tests/ui/imports/ambiguous-4-extern.stderr‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ warning: ambiguous glob re-exports
33
|
44
LL | pub use evp::*;
55
| ^^^^^^ the name `id` in the value namespace is first re-exported here
6+
LL |
67
LL | pub use handwritten::*;
78
| -------------- but the name `id` in the value namespace is also re-exported here
89
|
910
= note: `#[warn(ambiguous_glob_reexports)]` on by default
1011

1112
warning: `id` is ambiguous
12-
--> $DIR/ambiguous-4-extern.rs:25:5
13+
--> $DIR/ambiguous-4-extern.rs:26:5
1314
|
1415
LL | id();
1516
| ^^ ambiguous name
@@ -24,7 +25,7 @@ LL | pub use evp::*;
2425
| ^^^^^^
2526
= help: consider adding an explicit import of `id` to disambiguate
2627
note: `id` could also refer to the function imported here
27-
--> $DIR/ambiguous-4-extern.rs:13:9
28+
--> $DIR/ambiguous-4-extern.rs:14:9
2829
|
2930
LL | pub use handwritten::*;
3031
| ^^^^^^^^^^^^^^
@@ -39,7 +40,7 @@ warning: 2 warnings emitted
3940

4041
Future incompatibility report: Future breakage diagnostic:
4142
warning: `id` is ambiguous
42-
--> $DIR/ambiguous-4-extern.rs:25:5
43+
--> $DIR/ambiguous-4-extern.rs:26:5
4344
|
4445
LL | id();
4546
| ^^ ambiguous name
@@ -54,7 +55,7 @@ LL | pub use evp::*;
5455
| ^^^^^^
5556
= help: consider adding an explicit import of `id` to disambiguate
5657
note: `id` could also refer to the function imported here
57-
--> $DIR/ambiguous-4-extern.rs:13:9
58+
--> $DIR/ambiguous-4-extern.rs:14:9
5859
|
5960
LL | pub use handwritten::*;
6061
| ^^^^^^^^^^^^^^

‎tests/ui/imports/ambiguous-9.rs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,17 @@ pub mod dsl {
44
mod range {
55
pub fn date_range() {}
66
}
7-
pub use self::range::*; //~ WARNING ambiguous glob re-exports
7+
pub use self::range::*;
8+
//~^ WARNING ambiguous glob re-exports
89
use super::prelude::*;
910
}
1011

1112
pub mod prelude {
1213
mod t {
1314
pub fn date_range() {}
1415
}
15-
pub use self::t::*; //~ WARNING ambiguous glob re-exports
16+
pub use self::t::*;
17+
//~^ WARNING ambiguous glob re-exports
1618
pub use super::dsl::*;
1719
}
1820

‎tests/ui/imports/ambiguous-9.stderr‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ warning: ambiguous glob re-exports
33
|
44
LL | pub use self::range::*;
55
| ^^^^^^^^^^^^^^ the name `date_range` in the value namespace is first re-exported here
6+
LL |
67
LL | use super::prelude::*;
78
| ----------------- but the name `date_range` in the value namespace is also re-exported here
89
|
910
= note: `#[warn(ambiguous_glob_reexports)]` on by default
1011

1112
error: `date_range` is ambiguous
12-
--> $DIR/ambiguous-9.rs:23:5
13+
--> $DIR/ambiguous-9.rs:25:5
1314
|
1415
LL | date_range();
1516
| ^^^^^^^^^^ ambiguous name
@@ -24,23 +25,24 @@ LL | pub use self::range::*;
2425
| ^^^^^^^^^^^^^^
2526
= help: consider adding an explicit import of `date_range` to disambiguate
2627
note: `date_range` could also refer to the function imported here
27-
--> $DIR/ambiguous-9.rs:8:9
28+
--> $DIR/ambiguous-9.rs:9:9
2829
|
2930
LL | use super::prelude::*;
3031
| ^^^^^^^^^^^^^^^^^
3132
= help: consider adding an explicit import of `date_range` to disambiguate
3233
= note: `#[deny(ambiguous_glob_imports)]` on by default
3334

3435
warning: ambiguous glob re-exports
35-
--> $DIR/ambiguous-9.rs:15:13
36+
--> $DIR/ambiguous-9.rs:16:13
3637
|
3738
LL | pub use self::t::*;
3839
| ^^^^^^^^^^ the name `date_range` in the value namespace is first re-exported here
40+
LL |
3941
LL | pub use super::dsl::*;
4042
| ------------- but the name `date_range` in the value namespace is also re-exported here
4143

4244
error: `date_range` is ambiguous
43-
--> $DIR/ambiguous-9.rs:23:5
45+
--> $DIR/ambiguous-9.rs:25:5
4446
|
4547
LL | date_range();
4648
| ^^^^^^^^^^ ambiguous name
@@ -49,13 +51,13 @@ LL | date_range();
4951
= note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
5052
= note: ambiguous because of multiple glob imports of a name in the same module
5153
note: `date_range` could refer to the function imported here
52-
--> $DIR/ambiguous-9.rs:19:5
54+
--> $DIR/ambiguous-9.rs:21:5
5355
|
5456
LL | use dsl::*;
5557
| ^^^^^^
5658
= help: consider adding an explicit import of `date_range` to disambiguate
5759
note: `date_range` could also refer to the function imported here
58-
--> $DIR/ambiguous-9.rs:20:5
60+
--> $DIR/ambiguous-9.rs:22:5
5961
|
6062
LL | use prelude::*;
6163
| ^^^^^^^^^^
@@ -65,7 +67,7 @@ error: aborting due to 2 previous errors; 2 warnings emitted
6567

6668
Future incompatibility report: Future breakage diagnostic:
6769
error: `date_range` is ambiguous
68-
--> $DIR/ambiguous-9.rs:23:5
70+
--> $DIR/ambiguous-9.rs:25:5
6971
|
7072
LL | date_range();
7173
| ^^^^^^^^^^ ambiguous name
@@ -80,7 +82,7 @@ LL | pub use self::range::*;
8082
| ^^^^^^^^^^^^^^
8183
= help: consider adding an explicit import of `date_range` to disambiguate
8284
note: `date_range` could also refer to the function imported here
83-
--> $DIR/ambiguous-9.rs:8:9
85+
--> $DIR/ambiguous-9.rs:9:9
8486
|
8587
LL | use super::prelude::*;
8688
| ^^^^^^^^^^^^^^^^^
@@ -89,7 +91,7 @@ LL | use super::prelude::*;
8991

9092
Future breakage diagnostic:
9193
error: `date_range` is ambiguous
92-
--> $DIR/ambiguous-9.rs:23:5
94+
--> $DIR/ambiguous-9.rs:25:5
9395
|
9496
LL | date_range();
9597
| ^^^^^^^^^^ ambiguous name
@@ -98,13 +100,13 @@ LL | date_range();
98100
= note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
99101
= note: ambiguous because of multiple glob imports of a name in the same module
100102
note: `date_range` could refer to the function imported here
101-
--> $DIR/ambiguous-9.rs:19:5
103+
--> $DIR/ambiguous-9.rs:21:5
102104
|
103105
LL | use dsl::*;
104106
| ^^^^^^
105107
= help: consider adding an explicit import of `date_range` to disambiguate
106108
note: `date_range` could also refer to the function imported here
107-
--> $DIR/ambiguous-9.rs:20:5
109+
--> $DIR/ambiguous-9.rs:22:5
108110
|
109111
LL | use prelude::*;
110112
| ^^^^^^^^^^

‎tests/ui/imports/issue-56125.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ mod m2 {
1515
mod m3 {
1616
mod empty {}
1717
use empty::issue_56125; //~ ERROR unresolved import `empty::issue_56125`
18-
use issue_56125::*; //~ ERROR `issue_56125` is ambiguous
18+
use issue_56125::*;
1919
}
2020

2121
fn main() {}

‎tests/ui/imports/issue-56125.stderr‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,24 +54,7 @@ LL | use issue_56125::non_last_segment::non_last_segment::*;
5454
= help: consider adding an explicit import of `issue_56125` to disambiguate
5555
= help: or use `self::issue_56125` to refer to this module unambiguously
5656

57-
error[E0659]: `issue_56125` is ambiguous
58-
--> $DIR/issue-56125.rs:18:9
59-
|
60-
LL | use issue_56125::*;
61-
| ^^^^^^^^^^^ ambiguous name
62-
|
63-
= note: ambiguous because of a conflict between a name from a glob import and an outer scope during import or macro resolution
64-
= note: `issue_56125` could refer to a crate passed with `--extern`
65-
= help: use `::issue_56125` to refer to this crate unambiguously
66-
note: `issue_56125` could also refer to the module imported here
67-
--> $DIR/issue-56125.rs:18:9
68-
|
69-
LL | use issue_56125::*;
70-
| ^^^^^^^^^^^^^^
71-
= help: consider adding an explicit import of `issue_56125` to disambiguate
72-
= help: or use `self::issue_56125` to refer to this module unambiguously
73-
74-
error: aborting due to 4 previous errors
57+
error: aborting due to 3 previous errors
7558

7659
Some errors have detailed explanations: E0432, E0659.
7760
For more information about an error, try `rustc --explain E0432`.

‎tests/ui/imports/shadow-glob-module-resolution-2.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,5 @@ use a::*;
1313
use e as b;
1414
//~^ ERROR: unresolved import `e`
1515
use b::c::D as e;
16-
//~^ ERROR: cannot determine resolution for the import
17-
//~| ERROR: cannot determine resolution for the import
1816

1917
fn main() { }

‎tests/ui/imports/shadow-glob-module-resolution-2.stderr‎

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,3 @@
1-
error: cannot determine resolution for the import
2-
--> $DIR/shadow-glob-module-resolution-2.rs:15:5
3-
|
4-
LL | use b::c::D as e;
5-
| ^^^^^^^^^^^^
6-
7-
error: cannot determine resolution for the import
8-
--> $DIR/shadow-glob-module-resolution-2.rs:15:5
9-
|
10-
LL | use b::c::D as e;
11-
| ^^^^^^^^^^^^
12-
|
13-
= note: duplicate diagnostic emitted due to `-Z deduplicate-diagnostics=no`
14-
151
error[E0432]: unresolved import `e`
162
--> $DIR/shadow-glob-module-resolution-2.rs:13:5
173
|
@@ -21,6 +7,6 @@ LL | use e as b;
217
| no `e` in the root
228
| help: a similar name exists in the module: `a`
239

24-
error: aborting due to 3 previous errors
10+
error: aborting due to 1 previous error
2511

2612
For more information about this error, try `rustc --explain E0432`.

0 commit comments

Comments
 (0)