Skip to content

Commit 0f6b71c

Browse files
Bless and change test for review.
1 parent a77cc1b commit 0f6b71c

File tree

2 files changed

+3
-30
lines changed

2 files changed

+3
-30
lines changed

tests/ui/imports/ambiguous-panic-globvsglob.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,5 @@ fn foo() {
1818
panic!();
1919
//~^ WARN: `panic` is ambiguous [ambiguous_panic_imports]
2020
//~| WARN: this was previously accepted by the compiler
21-
//~| ERROR: `panic` is ambiguous [ambiguous_glob_imports]
22-
//~| WARN: this was previously accepted by the compiler
21+
//~| ERROR: `panic` is ambiguous
2322
}
Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
error: `panic` is ambiguous
1+
error[E0659]: `panic` is ambiguous
22
--> $DIR/ambiguous-panic-globvsglob.rs:18:5
33
|
44
LL | panic!();
55
| ^^^^^ ambiguous name
66
|
7-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
8-
= note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
97
= note: ambiguous because of multiple glob imports of a name in the same module
108
note: `panic` could refer to the macro imported here
119
--> $DIR/ambiguous-panic-globvsglob.rs:12:9
@@ -19,7 +17,6 @@ note: `panic` could also refer to the macro imported here
1917
LL | use m2::*;
2018
| ^^^^^
2119
= help: consider adding an explicit import of `panic` to disambiguate
22-
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
2320

2421
warning: `panic` is ambiguous
2522
--> $DIR/ambiguous-panic-globvsglob.rs:18:5
@@ -42,27 +39,4 @@ note: `panic` could also refer to a macro from prelude
4239

4340
error: aborting due to 1 previous error; 1 warning emitted
4441

45-
Future incompatibility report: Future breakage diagnostic:
46-
error: `panic` is ambiguous
47-
--> $DIR/ambiguous-panic-globvsglob.rs:18:5
48-
|
49-
LL | panic!();
50-
| ^^^^^ ambiguous name
51-
|
52-
= warning: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
53-
= note: for more information, see issue #114095 <https://github.com/rust-lang/rust/issues/114095>
54-
= note: ambiguous because of multiple glob imports of a name in the same module
55-
note: `panic` could refer to the macro imported here
56-
--> $DIR/ambiguous-panic-globvsglob.rs:12:9
57-
|
58-
LL | use m1::*;
59-
| ^^^^^
60-
= help: consider adding an explicit import of `panic` to disambiguate
61-
note: `panic` could also refer to the macro imported here
62-
--> $DIR/ambiguous-panic-globvsglob.rs:13:9
63-
|
64-
LL | use m2::*;
65-
| ^^^^^
66-
= help: consider adding an explicit import of `panic` to disambiguate
67-
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
68-
42+
For more information about this error, try `rustc --explain E0659`.

0 commit comments

Comments
 (0)