user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rollup merge of #151130 - diesel2, r=lqd

Browse source 
resolve: Downgrade `ambiguous_glob_imports` to warn-by-default

But still keep it report-in-deps, as decided in https://github.com/rust-lang/rust/issues/149845#issuecomment-3750423840.

This will need to be reverted after ~February 27 2026, when Rust 1.95 branches out from the main branch.

Closes https://github.com/rust-lang/rust/issues/149845.
This commit is contained in:
Stuart Cook 2026-01-15 21:39:04 +11:00 • committed by GitHub
commit 256722639d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
49 changed files with 188 additions and 186 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_lint_defs/src/builtin.rs
View file

@ -4465,7 +4465,7 @@ declare_lint! {
///
/// [future-incompatible]: ../index.md#future-incompatible-lints
pub AMBIGUOUS_GLOB_IMPORTS,
Deny,
Warn,
"detects certain glob imports that require reporting an ambiguity error",
@future_incompatible = FutureIncompatibleInfo {
reason: fcw!(FutureReleaseError #114095),

4
tests/ui/imports/ambiguous-10.rs
View file

@ -1,5 +1,5 @@
// https://github.com/rust-lang/rust/pull/113099#issuecomment-1637022296
//@ check-pass
mod a {
pub enum Token {}
}
@ -13,6 +13,6 @@ mod b {
use crate::a::*;
use crate::b::*;
fn c(_: Token) {}
//~^ ERROR `Token` is ambiguous
//~^ WARN `Token` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
fn main() { }

10
tests/ui/imports/ambiguous-10.stderr
View file

@ -1,4 +1,4 @@
error: `Token` is ambiguous
warning: `Token` is ambiguous
--> $DIR/ambiguous-10.rs:15:9
|
LL | fn c(_: Token) {}
@ -19,12 +19,12 @@ note: `Token` could also refer to the enum imported here
LL | use crate::b::*;
| ^^^^^^^^^^^
= help: consider adding an explicit import of `Token` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `Token` is ambiguous
warning: `Token` is ambiguous
--> $DIR/ambiguous-10.rs:15:9
|
LL | fn c(_: Token) {}
@ -45,5 +45,5 @@ note: `Token` could also refer to the enum imported here
LL | use crate::b::*;
| ^^^^^^^^^^^
= help: consider adding an explicit import of `Token` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-12.rs
View file

@ -1,5 +1,5 @@
// https://github.com/rust-lang/rust/pull/113099#issuecomment-1637022296
//@ check-pass
macro_rules! m {
() => {
pub fn b() {}
@ -19,6 +19,6 @@ use crate::public::*;
fn main() {
b();
//~^ ERROR `b` is ambiguous
//~^ WARN `b` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
}

10
tests/ui/imports/ambiguous-12.stderr
View file

@ -1,4 +1,4 @@
error: `b` is ambiguous
warning: `b` is ambiguous
--> $DIR/ambiguous-12.rs:21:5
|
LL | b();
@ -19,12 +19,12 @@ note: `b` could also refer to the function imported here
LL | use crate::public::*;
| ^^^^^^^^^^^^^^^^
= help: consider adding an explicit import of `b` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `b` is ambiguous
warning: `b` is ambiguous
--> $DIR/ambiguous-12.rs:21:5
|
LL | b();
@ -45,5 +45,5 @@ note: `b` could also refer to the function imported here
LL | use crate::public::*;
| ^^^^^^^^^^^^^^^^
= help: consider adding an explicit import of `b` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-13.rs
View file

@ -1,5 +1,5 @@
// https://github.com/rust-lang/rust/pull/113099#issuecomment-1637022296
//@ check-pass
pub mod object {
#[derive(Debug)]
pub struct Rect;
@ -16,6 +16,6 @@ use crate::object::*;
use crate::content::*;
fn a(_: Rect) {}
//~^ ERROR `Rect` is ambiguous
//~^ WARN `Rect` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
fn main() { }

10
tests/ui/imports/ambiguous-13.stderr
View file

@ -1,4 +1,4 @@
error: `Rect` is ambiguous
warning: `Rect` is ambiguous
--> $DIR/ambiguous-13.rs:18:9
|
LL | fn a(_: Rect) {}
@ -19,12 +19,12 @@ note: `Rect` could also refer to the struct imported here
LL | use crate::content::*;
| ^^^^^^^^^^^^^^^^^
= help: consider adding an explicit import of `Rect` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `Rect` is ambiguous
warning: `Rect` is ambiguous
--> $DIR/ambiguous-13.rs:18:9
|
LL | fn a(_: Rect) {}
@ -45,5 +45,5 @@ note: `Rect` could also refer to the struct imported here
LL | use crate::content::*;
| ^^^^^^^^^^^^^^^^^
= help: consider adding an explicit import of `Rect` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-14.rs
View file

@ -1,6 +1,6 @@
//@ edition:2015
// https://github.com/rust-lang/rust/issues/98467
//@ check-pass
mod a {
pub fn foo() {}
}
@ -21,6 +21,6 @@ mod g {
fn main() {
g::foo();
//~^ ERROR `foo` is ambiguous
//~^ WARN `foo` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
}

10
tests/ui/imports/ambiguous-14.stderr
View file

@ -1,4 +1,4 @@
error: `foo` is ambiguous
warning: `foo` is ambiguous
--> $DIR/ambiguous-14.rs:23:8
|
LL | g::foo();
@ -19,12 +19,12 @@ note: `foo` could also refer to the function imported here
LL | pub use f::*;
| ^^^^
= help: consider adding an explicit import of `foo` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `foo` is ambiguous
warning: `foo` is ambiguous
--> $DIR/ambiguous-14.rs:23:8
|
LL | g::foo();
@ -45,5 +45,5 @@ note: `foo` could also refer to the function imported here
LL | pub use f::*;
| ^^^^
= help: consider adding an explicit import of `foo` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-15.rs
View file

@ -1,5 +1,5 @@
// https://github.com/rust-lang/rust/pull/113099#issuecomment-1638206152
//@ check-pass
mod t2 {
#[derive(Debug)]
pub enum Error {}
@ -20,7 +20,7 @@ mod t3 {
use self::t3::*;
fn a<E: Error>(_: E) {}
//~^ ERROR `Error` is ambiguous
//~^ WARN `Error` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
fn main() {}

10
tests/ui/imports/ambiguous-15.stderr
View file

@ -1,4 +1,4 @@
error: `Error` is ambiguous
warning: `Error` is ambiguous
--> $DIR/ambiguous-15.rs:22:9
|
LL | fn a<E: Error>(_: E) {}
@ -19,12 +19,12 @@ note: `Error` could also refer to the enum imported here
LL | pub use t2::*;
| ^^^^^
= help: consider adding an explicit import of `Error` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `Error` is ambiguous
warning: `Error` is ambiguous
--> $DIR/ambiguous-15.rs:22:9
|
LL | fn a<E: Error>(_: E) {}
@ -45,5 +45,5 @@ note: `Error` could also refer to the enum imported here
LL | pub use t2::*;
| ^^^^^
= help: consider adding an explicit import of `Error` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-16.rs
View file

@ -1,5 +1,5 @@
// https://github.com/rust-lang/rust/pull/113099
//@ check-pass
mod framing {
mod public_message {
use super::*;
@ -20,7 +20,7 @@ mod framing {
}
use crate::framing::ConfirmedTranscriptHashInput;
//~^ ERROR `ConfirmedTranscriptHashInput` is ambiguous
//~^ WARN `ConfirmedTranscriptHashInput` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
fn main() { }

10
tests/ui/imports/ambiguous-16.stderr
View file

@ -1,4 +1,4 @@
error: `ConfirmedTranscriptHashInput` is ambiguous
warning: `ConfirmedTranscriptHashInput` is ambiguous
--> $DIR/ambiguous-16.rs:22:21
|
LL | use crate::framing::ConfirmedTranscriptHashInput;
@ -19,12 +19,12 @@ note: `ConfirmedTranscriptHashInput` could also refer to the struct imported her
LL | pub use self::public_message_in::*;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
= help: consider adding an explicit import of `ConfirmedTranscriptHashInput` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `ConfirmedTranscriptHashInput` is ambiguous
warning: `ConfirmedTranscriptHashInput` is ambiguous
--> $DIR/ambiguous-16.rs:22:21
|
LL | use crate::framing::ConfirmedTranscriptHashInput;
@ -45,5 +45,5 @@ note: `ConfirmedTranscriptHashInput` could also refer to the struct imported her
LL | pub use self::public_message_in::*;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^
= help: consider adding an explicit import of `ConfirmedTranscriptHashInput` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-17.rs
View file

@ -1,6 +1,6 @@
//@ edition:2015
// https://github.com/rust-lang/rust/pull/113099#issuecomment-1638206152
//@ check-pass
pub use evp::*; //~ WARNING ambiguous glob re-exports
pub use handwritten::*;
@ -24,6 +24,6 @@ mod handwritten {
fn main() {
id();
//~^ ERROR `id` is ambiguous
//~^ WARN `id` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
}

10
tests/ui/imports/ambiguous-17.stderr
View file

@ -8,7 +8,7 @@ LL | pub use handwritten::*;
|
= note: `#[warn(ambiguous_glob_reexports)]` on by default
error: `id` is ambiguous
warning: `id` is ambiguous
--> $DIR/ambiguous-17.rs:26:5
|
LL | id();
@ -29,12 +29,12 @@ note: `id` could also refer to the function imported here
LL | pub use handwritten::*;
| ^^^^^^^^^^^^^^
= help: consider adding an explicit import of `id` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error; 1 warning emitted
warning: 2 warnings emitted
Future incompatibility report: Future breakage diagnostic:
error: `id` is ambiguous
warning: `id` is ambiguous
--> $DIR/ambiguous-17.rs:26:5
|
LL | id();
@ -55,5 +55,5 @@ note: `id` could also refer to the function imported here
LL | pub use handwritten::*;
| ^^^^^^^^^^^^^^
= help: consider adding an explicit import of `id` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-2.rs
View file

@ -1,9 +1,9 @@
//@ aux-build: ../ambiguous-1.rs
// https://github.com/rust-lang/rust/pull/113099#issuecomment-1633574396
//@ check-pass
extern crate ambiguous_1;
fn main() {
ambiguous_1::id(); //~ ERROR `id` is ambiguous
ambiguous_1::id(); //~ WARN `id` is ambiguous
//~| WARN this was previously accepted
}

10
tests/ui/imports/ambiguous-2.stderr
View file

@ -1,4 +1,4 @@
error: `id` is ambiguous
warning: `id` is ambiguous
--> $DIR/ambiguous-2.rs:7:18
|
LL | ambiguous_1::id();
@ -17,12 +17,12 @@ note: `id` could also refer to the function defined here
|
LL | pub use self::handwritten::*;
| ^^^^^^^^^^^^^^^^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `id` is ambiguous
warning: `id` is ambiguous
--> $DIR/ambiguous-2.rs:7:18
|
LL | ambiguous_1::id();
@ -41,5 +41,5 @@ note: `id` could also refer to the function defined here
|
LL | pub use self::handwritten::*;
| ^^^^^^^^^^^^^^^^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-3.rs
View file

@ -1,9 +1,9 @@
// https://github.com/rust-lang/rust/issues/47525
//@ check-pass
fn main() {
use a::*;
x();
//~^ ERROR `x` is ambiguous
//~^ WARN `x` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
}

10
tests/ui/imports/ambiguous-3.stderr
View file

@ -1,4 +1,4 @@
error: `x` is ambiguous
warning: `x` is ambiguous
--> $DIR/ambiguous-3.rs:5:5
|
LL | x();
@ -19,12 +19,12 @@ note: `x` could also refer to the function imported here
LL | pub use self::c::*;
| ^^^^^^^^^^
= help: consider adding an explicit import of `x` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `x` is ambiguous
warning: `x` is ambiguous
--> $DIR/ambiguous-3.rs:5:5
|
LL | x();
@ -45,5 +45,5 @@ note: `x` could also refer to the function imported here
LL | pub use self::c::*;
| ^^^^^^^^^^
= help: consider adding an explicit import of `x` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-4.rs
View file

@ -1,9 +1,9 @@
//@ edition:2015
//@ aux-build: ../ambiguous-4-extern.rs
//@ check-pass
extern crate ambiguous_4_extern;
fn main() {
ambiguous_4_extern::id(); //~ ERROR `id` is ambiguous
ambiguous_4_extern::id(); //~ WARN `id` is ambiguous
//~| WARN this was previously accepted
}

10
tests/ui/imports/ambiguous-4.stderr
View file

@ -1,4 +1,4 @@
error: `id` is ambiguous
warning: `id` is ambiguous
--> $DIR/ambiguous-4.rs:7:25
|
LL | ambiguous_4_extern::id();
@ -17,12 +17,12 @@ note: `id` could also refer to the function defined here
|
LL | pub use handwritten::*;
| ^^^^^^^^^^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `id` is ambiguous
warning: `id` is ambiguous
--> $DIR/ambiguous-4.rs:7:25
|
LL | ambiguous_4_extern::id();
@ -41,5 +41,5 @@ note: `id` could also refer to the function defined here
|
LL | pub use handwritten::*;
| ^^^^^^^^^^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-5.rs
View file

@ -1,5 +1,5 @@
// https://github.com/rust-lang/rust/pull/113099#issuecomment-1637022296
//@ check-pass
mod a {
pub struct Class(u16);
}
@ -10,7 +10,7 @@ mod gpos {
use super::gsubgpos::*;
use super::*;
struct MarkRecord(Class);
//~^ ERROR`Class` is ambiguous
//~^ WARN`Class` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
}

10
tests/ui/imports/ambiguous-5.stderr
View file

@ -1,4 +1,4 @@
error: `Class` is ambiguous
warning: `Class` is ambiguous
--> $DIR/ambiguous-5.rs:12:23
|
LL | struct MarkRecord(Class);
@ -19,12 +19,12 @@ note: `Class` could also refer to the struct imported here
LL | use super::gsubgpos::*;
| ^^^^^^^^^^^^^^^^^^
= help: consider adding an explicit import of `Class` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `Class` is ambiguous
warning: `Class` is ambiguous
--> $DIR/ambiguous-5.rs:12:23
|
LL | struct MarkRecord(Class);
@ -45,5 +45,5 @@ note: `Class` could also refer to the struct imported here
LL | use super::gsubgpos::*;
| ^^^^^^^^^^^^^^^^^^
= help: consider adding an explicit import of `Class` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-6.rs
View file

@ -1,10 +1,10 @@
//@ edition: 2021
// https://github.com/rust-lang/rust/issues/112713
//@ check-pass
pub fn foo() -> u32 {
use sub::*;
C
//~^ ERROR `C` is ambiguous
//~^ WARN `C` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
}

10
tests/ui/imports/ambiguous-6.stderr
View file

@ -1,4 +1,4 @@
error: `C` is ambiguous
warning: `C` is ambiguous
--> $DIR/ambiguous-6.rs:6:5
|
LL | C
@ -19,12 +19,12 @@ note: `C` could also refer to the constant imported here
LL | pub use mod2::*;
| ^^^^^^^
= help: consider adding an explicit import of `C` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `C` is ambiguous
warning: `C` is ambiguous
--> $DIR/ambiguous-6.rs:6:5
|
LL | C
@ -45,5 +45,5 @@ note: `C` could also refer to the constant imported here
LL | pub use mod2::*;
| ^^^^^^^
= help: consider adding an explicit import of `C` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

6
tests/ui/imports/ambiguous-9.rs
View file

@ -1,5 +1,5 @@
// https://github.com/rust-lang/rust/pull/113099#issuecomment-1638206152
//@ check-pass
pub mod dsl {
mod range {
pub fn date_range() {}
@ -21,8 +21,8 @@ use prelude::*;
fn main() {
date_range();
//~^ ERROR `date_range` is ambiguous
//~^ WARN `date_range` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
//~| ERROR `date_range` is ambiguous
//~| WARN `date_range` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
}

16
tests/ui/imports/ambiguous-9.stderr
View file

@ -8,7 +8,7 @@ LL | use super::prelude::*;
|
= note: `#[warn(ambiguous_glob_reexports)]` on by default
error: `date_range` is ambiguous
warning: `date_range` is ambiguous
--> $DIR/ambiguous-9.rs:23:5
|
LL | date_range();
@ -29,7 +29,7 @@ note: `date_range` could also refer to the function imported here
LL | use super::prelude::*;
| ^^^^^^^^^^^^^^^^^
= help: consider adding an explicit import of `date_range` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
warning: ambiguous glob re-exports
--> $DIR/ambiguous-9.rs:15:13
@ -39,7 +39,7 @@ LL | pub use self::t::*;
LL | pub use super::dsl::*;
| ------------- but the name `date_range` in the value namespace is also re-exported here
error: `date_range` is ambiguous
warning: `date_range` is ambiguous
--> $DIR/ambiguous-9.rs:23:5
|
LL | date_range();
@ -61,10 +61,10 @@ LL | use prelude::*;
| ^^^^^^^^^^
= help: consider adding an explicit import of `date_range` to disambiguate
error: aborting due to 2 previous errors; 2 warnings emitted
warning: 4 warnings emitted
Future incompatibility report: Future breakage diagnostic:
error: `date_range` is ambiguous
warning: `date_range` is ambiguous
--> $DIR/ambiguous-9.rs:23:5
|
LL | date_range();
@ -85,10 +85,10 @@ note: `date_range` could also refer to the function imported here
LL | use super::prelude::*;
| ^^^^^^^^^^^^^^^^^
= help: consider adding an explicit import of `date_range` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
Future breakage diagnostic:
error: `date_range` is ambiguous
warning: `date_range` is ambiguous
--> $DIR/ambiguous-9.rs:23:5
|
LL | date_range();
@ -109,5 +109,5 @@ note: `date_range` could also refer to the function imported here
LL | use prelude::*;
| ^^^^^^^^^^
= help: consider adding an explicit import of `date_range` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/ambiguous-panic-globvsglob.rs
View file

@ -3,7 +3,7 @@
mod m1 {
pub use core::prelude::v1::*;
}
//@ check-pass
mod m2 {
pub use std::prelude::v1::*;
}
@ -18,6 +18,6 @@ fn foo() {
panic!();
//~^ WARN: `panic` is ambiguous [ambiguous_panic_imports]
//~| WARN: this was previously accepted by the compiler
//~| ERROR: `panic` is ambiguous [ambiguous_glob_imports]
//~| WARN: `panic` is ambiguous [ambiguous_glob_imports]
//~| WARN: this was previously accepted by the compiler
}

10
tests/ui/imports/ambiguous-panic-globvsglob.stderr
View file

@ -1,4 +1,4 @@
error: `panic` is ambiguous
warning: `panic` is ambiguous
--> $DIR/ambiguous-panic-globvsglob.rs:18:5
|
LL | panic!();
@ -19,7 +19,7 @@ note: `panic` could also refer to the macro imported here
LL | use m2::*;
| ^^^^^
= help: consider adding an explicit import of `panic` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
warning: `panic` is ambiguous
--> $DIR/ambiguous-panic-globvsglob.rs:18:5
@ -40,10 +40,10 @@ note: `panic` could also refer to a macro from prelude
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
= note: `#[warn(ambiguous_panic_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error; 1 warning emitted
warning: 2 warnings emitted
Future incompatibility report: Future breakage diagnostic:
error: `panic` is ambiguous
warning: `panic` is ambiguous
--> $DIR/ambiguous-panic-globvsglob.rs:18:5
|
LL | panic!();
@ -64,5 +64,5 @@ note: `panic` could also refer to the macro imported here
LL | use m2::*;
| ^^^^^
= help: consider adding an explicit import of `panic` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

2
tests/ui/imports/duplicate.rs
View file

@ -34,7 +34,7 @@ fn main() {
e::foo();
f::foo(); //~ ERROR `foo` is ambiguous
g::foo();
//~^ ERROR `foo` is ambiguous
//~^ WARN `foo` is ambiguous
//~| WARNING this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
}

10
tests/ui/imports/duplicate.stderr
View file

@ -68,7 +68,7 @@ LL | use self::m2::*;
| ^^^^^^^^^^^
= help: consider adding an explicit import of `foo` to disambiguate
error: `foo` is ambiguous
warning: `foo` is ambiguous
--> $DIR/duplicate.rs:36:8
|
LL | g::foo();
@ -89,14 +89,14 @@ note: `foo` could also refer to the function imported here
LL | pub use crate::f::*;
| ^^^^^^^^^^^
= help: consider adding an explicit import of `foo` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 5 previous errors
error: aborting due to 4 previous errors; 1 warning emitted
Some errors have detailed explanations: E0252, E0659.
For more information about an error, try `rustc --explain E0252`.
Future incompatibility report: Future breakage diagnostic:
error: `foo` is ambiguous
warning: `foo` is ambiguous
--> $DIR/duplicate.rs:36:8
|
LL | g::foo();
@ -117,5 +117,5 @@ note: `foo` could also refer to the function imported here
LL | pub use crate::f::*;
| ^^^^^^^^^^^
= help: consider adding an explicit import of `foo` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

6
tests/ui/imports/glob-conflict-cross-crate-1.rs
View file

@ -1,11 +1,11 @@
//@ edition:2015
//@ aux-build:glob-conflict.rs
//@ check-pass
extern crate glob_conflict;
fn main() {
glob_conflict::f(); //~ ERROR `f` is ambiguous
glob_conflict::f(); //~ WARN `f` is ambiguous
//~| WARN this was previously accepted
glob_conflict::glob::f(); //~ ERROR `f` is ambiguous
glob_conflict::glob::f(); //~ WARN `f` is ambiguous
//~| WARN this was previously accepted
}

16
tests/ui/imports/glob-conflict-cross-crate-1.stderr
View file

@ -1,4 +1,4 @@
error: `f` is ambiguous
warning: `f` is ambiguous
--> $DIR/glob-conflict-cross-crate-1.rs:7:20
|
LL | glob_conflict::f();
@ -17,9 +17,9 @@ note: `f` could also refer to the function defined here
|
LL | pub use m2::*;
| ^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: `f` is ambiguous
warning: `f` is ambiguous
--> $DIR/glob-conflict-cross-crate-1.rs:9:26
|
LL | glob_conflict::glob::f();
@ -39,10 +39,10 @@ note: `f` could also refer to the function defined here
LL | pub use m2::*;
| ^^
error: aborting due to 2 previous errors
warning: 2 warnings emitted
Future incompatibility report: Future breakage diagnostic:
error: `f` is ambiguous
warning: `f` is ambiguous
--> $DIR/glob-conflict-cross-crate-1.rs:7:20
|
LL | glob_conflict::f();
@ -61,10 +61,10 @@ note: `f` could also refer to the function defined here
|
LL | pub use m2::*;
| ^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
Future breakage diagnostic:
error: `f` is ambiguous
warning: `f` is ambiguous
--> $DIR/glob-conflict-cross-crate-1.rs:9:26
|
LL | glob_conflict::glob::f();
@ -83,5 +83,5 @@ note: `f` could also refer to the function defined here
|
LL | pub use m2::*;
| ^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/glob-conflict-cross-crate-2.rs
View file

@ -1,10 +1,10 @@
//@ aux-build:glob-conflict-cross-crate-2-extern.rs
//@ check-pass
extern crate glob_conflict_cross_crate_2_extern;
use glob_conflict_cross_crate_2_extern::*;
fn main() {
let _a: C = 1; //~ ERROR `C` is ambiguous
let _a: C = 1; //~ WARN `C` is ambiguous
//~| WARN this was previously accepted
}

10
tests/ui/imports/glob-conflict-cross-crate-2.stderr
View file

@ -1,4 +1,4 @@
error: `C` is ambiguous
warning: `C` is ambiguous
--> $DIR/glob-conflict-cross-crate-2.rs:8:13
|
LL | let _a: C = 1;
@ -17,12 +17,12 @@ note: `C` could also refer to the type alias defined here
|
LL | pub use b::*;
| ^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `C` is ambiguous
warning: `C` is ambiguous
--> $DIR/glob-conflict-cross-crate-2.rs:8:13
|
LL | let _a: C = 1;
@ -41,5 +41,5 @@ note: `C` could also refer to the type alias defined here
|
LL | pub use b::*;
| ^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

6
tests/ui/imports/glob-conflict-cross-crate-3.rs
View file

@ -1,5 +1,5 @@
//@ aux-build:glob-conflict-cross-crate-2-extern.rs
//@ check-pass
extern crate glob_conflict_cross_crate_2_extern;
mod a {
@ -11,8 +11,8 @@ use a::*;
fn main() {
let _a: C = 1;
//~^ ERROR `C` is ambiguous
//~| ERROR `C` is ambiguous
//~^ WARN `C` is ambiguous
//~| WARN `C` is ambiguous
//~| WARN this was previously accepted
//~| WARN this was previously accepted
}

16
tests/ui/imports/glob-conflict-cross-crate-3.stderr
View file

@ -1,4 +1,4 @@
error: `C` is ambiguous
warning: `C` is ambiguous
--> $DIR/glob-conflict-cross-crate-3.rs:13:13
|
LL | let _a: C = 1;
@ -17,9 +17,9 @@ note: `C` could also refer to the type alias defined here
|
LL | pub use b::*;
| ^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: `C` is ambiguous
warning: `C` is ambiguous
--> $DIR/glob-conflict-cross-crate-3.rs:13:13
|
LL | let _a: C = 1;
@ -41,10 +41,10 @@ LL | use a::*;
| ^^^^
= help: consider adding an explicit import of `C` to disambiguate
error: aborting due to 2 previous errors
warning: 2 warnings emitted
Future incompatibility report: Future breakage diagnostic:
error: `C` is ambiguous
warning: `C` is ambiguous
--> $DIR/glob-conflict-cross-crate-3.rs:13:13
|
LL | let _a: C = 1;
@ -63,10 +63,10 @@ note: `C` could also refer to the type alias defined here
|
LL | pub use b::*;
| ^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
Future breakage diagnostic:
error: `C` is ambiguous
warning: `C` is ambiguous
--> $DIR/glob-conflict-cross-crate-3.rs:13:13
|
LL | let _a: C = 1;
@ -87,5 +87,5 @@ note: `C` could also refer to the type alias imported here
LL | use a::*;
| ^^^^
= help: consider adding an explicit import of `C` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

6
tests/ui/imports/issue-114682-2.rs
View file

@ -1,12 +1,12 @@
//@ aux-build: issue-114682-2-extern.rs
// https://github.com/rust-lang/rust/pull/114682#issuecomment-1879998900
//@ check-pass
extern crate issue_114682_2_extern;
use issue_114682_2_extern::max; //~ ERROR `max` is ambiguous
use issue_114682_2_extern::max; //~ WARN `max` is ambiguous
//~| WARN this was previously accepted
type A = issue_114682_2_extern::max; //~ ERROR `max` is ambiguous
type A = issue_114682_2_extern::max; //~ WARN `max` is ambiguous
//~| WARN this was previously accepted
fn main() {}

16
tests/ui/imports/issue-114682-2.stderr
View file

@ -1,4 +1,4 @@
error: `max` is ambiguous
warning: `max` is ambiguous
--> $DIR/issue-114682-2.rs:6:28
|
LL | use issue_114682_2_extern::max;
@ -17,9 +17,9 @@ note: `max` could also refer to the module defined here
|
LL | pub use self::d::*;
| ^^^^^^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: `max` is ambiguous
warning: `max` is ambiguous
--> $DIR/issue-114682-2.rs:9:33
|
LL | type A = issue_114682_2_extern::max;
@ -39,10 +39,10 @@ note: `max` could also refer to the module defined here
LL | pub use self::d::*;
| ^^^^^^^
error: aborting due to 2 previous errors
warning: 2 warnings emitted
Future incompatibility report: Future breakage diagnostic:
error: `max` is ambiguous
warning: `max` is ambiguous
--> $DIR/issue-114682-2.rs:6:28
|
LL | use issue_114682_2_extern::max;
@ -61,10 +61,10 @@ note: `max` could also refer to the module defined here
|
LL | pub use self::d::*;
| ^^^^^^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
Future breakage diagnostic:
error: `max` is ambiguous
warning: `max` is ambiguous
--> $DIR/issue-114682-2.rs:9:33
|
LL | type A = issue_114682_2_extern::max;
@ -83,5 +83,5 @@ note: `max` could also refer to the module defined here
|
LL | pub use self::d::*;
| ^^^^^^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

2
tests/ui/imports/issue-114682-4.rs
View file

@ -6,7 +6,7 @@ extern crate issue_114682_4_extern;
use issue_114682_4_extern::*;
//~v ERROR type alias takes 1 generic argument but 2 generic arguments were supplied
fn a() -> Result<i32, ()> { //~ ERROR `Result` is ambiguous
fn a() -> Result<i32, ()> { //~ WARN `Result` is ambiguous
//~| WARN this was previously accepted
Ok(1)
}

10
tests/ui/imports/issue-114682-4.stderr
View file

@ -1,4 +1,4 @@
error: `Result` is ambiguous
warning: `Result` is ambiguous
--> $DIR/issue-114682-4.rs:9:11
|
LL | fn a() -> Result<i32, ()> {
@ -17,7 +17,7 @@ note: `Result` could also refer to the type alias defined here
|
LL | pub use b::*;
| ^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error[E0107]: type alias takes 1 generic argument but 2 generic arguments were supplied
--> $DIR/issue-114682-4.rs:9:11
@ -33,11 +33,11 @@ note: type alias defined here, with 1 generic parameter: `T`
LL | pub type Result<T> = std::result::Result<T, ()>;
| ^^^^^^ -
error: aborting due to 2 previous errors
error: aborting due to 1 previous error; 1 warning emitted
For more information about this error, try `rustc --explain E0107`.
Future incompatibility report: Future breakage diagnostic:
error: `Result` is ambiguous
warning: `Result` is ambiguous
--> $DIR/issue-114682-4.rs:9:11
|
LL | fn a() -> Result<i32, ()> {
@ -56,5 +56,5 @@ note: `Result` could also refer to the type alias defined here
|
LL | pub use b::*;
| ^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

2
tests/ui/imports/issue-114682-5.rs
View file

@ -9,7 +9,7 @@ extern crate issue_114682_5_extern_2;
use issue_114682_5_extern_2::p::*;
use issue_114682_5_extern_1::Url;
//~^ ERROR `issue_114682_5_extern_1` is ambiguous
//~| ERROR `issue_114682_5_extern_1` is ambiguous
//~| WARN `issue_114682_5_extern_1` is ambiguous
//~| ERROR unresolved import `issue_114682_5_extern_1::Url`
//~| WARN this was previously accepted

10
tests/ui/imports/issue-114682-5.stderr
View file

@ -26,7 +26,7 @@ LL | use issue_114682_5_extern_2::p::*;
= help: consider adding an explicit import of `issue_114682_5_extern_1` to disambiguate
= help: or use `crate::issue_114682_5_extern_1` to refer to this module unambiguously
error: `issue_114682_5_extern_1` is ambiguous
warning: `issue_114682_5_extern_1` is ambiguous
--> $DIR/issue-114682-5.rs:10:5
|
LL | use issue_114682_5_extern_1::Url;
@ -46,14 +46,14 @@ note: `issue_114682_5_extern_1` could also refer to the crate defined here
LL | pub use crate::*;
| ^^^^^
= help: use `::issue_114682_5_extern_1` to refer to this crate unambiguously
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 3 previous errors
error: aborting due to 2 previous errors; 1 warning emitted
Some errors have detailed explanations: E0432, E0659.
For more information about an error, try `rustc --explain E0432`.
Future incompatibility report: Future breakage diagnostic:
error: `issue_114682_5_extern_1` is ambiguous
warning: `issue_114682_5_extern_1` is ambiguous
--> $DIR/issue-114682-5.rs:10:5
|
LL | use issue_114682_5_extern_1::Url;
@ -73,5 +73,5 @@ note: `issue_114682_5_extern_1` could also refer to the crate defined here
LL | pub use crate::*;
| ^^^^^
= help: use `::issue_114682_5_extern_1` to refer to this crate unambiguously
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/issue-114682-6.rs
View file

@ -1,12 +1,12 @@
//@ aux-build: issue-114682-6-extern.rs
// https://github.com/rust-lang/rust/pull/114682#issuecomment-1880755441
//@ check-pass
extern crate issue_114682_6_extern;
use issue_114682_6_extern::*;
fn main() {
let log = 2; //~ ERROR `log` is ambiguous
let log = 2; //~ WARN `log` is ambiguous
//~| WARN this was previously accepted
let _ = log;
}

10
tests/ui/imports/issue-114682-6.stderr
View file

@ -1,4 +1,4 @@
error: `log` is ambiguous
warning: `log` is ambiguous
--> $DIR/issue-114682-6.rs:9:9
|
LL | let log = 2;
@ -17,12 +17,12 @@ note: `log` could also refer to the function defined here
|
LL | pub use self::b::*;
| ^^^^^^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `log` is ambiguous
warning: `log` is ambiguous
--> $DIR/issue-114682-6.rs:9:9
|
LL | let log = 2;
@ -41,5 +41,5 @@ note: `log` could also refer to the function defined here
|
LL | pub use self::b::*;
| ^^^^^^^
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

4
tests/ui/imports/overwrite-different-ambig-2.rs
View file

@ -1,3 +1,5 @@
//@ check-pass
mod m1 {
mod inner {
pub struct S {}
@ -19,6 +21,6 @@ use m1::*;
use m2::*;
fn main() {
let _: m1::S = S {}; //~ ERROR `S` is ambiguous
let _: m1::S = S {}; //~ WARN `S` is ambiguous
//~| WARN this was previously accepted
}

22
tests/ui/imports/overwrite-different-ambig-2.stderr
View file

@ -1,5 +1,5 @@
error: `S` is ambiguous
--> $DIR/overwrite-different-ambig-2.rs:22:20
warning: `S` is ambiguous
--> $DIR/overwrite-different-ambig-2.rs:24:20
|
LL | let _: m1::S = S {};
| ^ ambiguous name
@ -8,24 +8,24 @@ LL | let _: m1::S = S {};
= 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: `S` could refer to the struct imported here
--> $DIR/overwrite-different-ambig-2.rs:18:5
--> $DIR/overwrite-different-ambig-2.rs:20:5
|
LL | use m1::*;
| ^^^^^
= help: consider adding an explicit import of `S` to disambiguate
note: `S` could also refer to the struct imported here
--> $DIR/overwrite-different-ambig-2.rs:19:5
--> $DIR/overwrite-different-ambig-2.rs:21:5
|
LL | use m2::*;
| ^^^^^
= help: consider adding an explicit import of `S` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 1 previous error
warning: 1 warning emitted
Future incompatibility report: Future breakage diagnostic:
error: `S` is ambiguous
--> $DIR/overwrite-different-ambig-2.rs:22:20
warning: `S` is ambiguous
--> $DIR/overwrite-different-ambig-2.rs:24:20
|
LL | let _: m1::S = S {};
| ^ ambiguous name
@ -34,16 +34,16 @@ LL | let _: m1::S = S {};
= 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: `S` could refer to the struct imported here
--> $DIR/overwrite-different-ambig-2.rs:18:5
--> $DIR/overwrite-different-ambig-2.rs:20:5
|
LL | use m1::*;
| ^^^^^
= help: consider adding an explicit import of `S` to disambiguate
note: `S` could also refer to the struct imported here
--> $DIR/overwrite-different-ambig-2.rs:19:5
--> $DIR/overwrite-different-ambig-2.rs:21:5
|
LL | use m2::*;
| ^^^^^
= help: consider adding an explicit import of `S` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default

2
tests/ui/imports/unresolved-seg-after-ambiguous.rs
View file

@ -18,7 +18,7 @@ mod a {
use self::a::E::in_exist;
//~^ ERROR: unresolved import `self::a::E`
//~| ERROR: `E` is ambiguous
//~| WARN: `E` is ambiguous
//~| WARNING: this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
fn main() {}

10
tests/ui/imports/unresolved-seg-after-ambiguous.stderr
View file

@ -4,7 +4,7 @@ error[E0432]: unresolved import `self::a::E`
LL | use self::a::E::in_exist;
| ^ `E` is a struct, not a module
error: `E` is ambiguous
warning: `E` is ambiguous
--> $DIR/unresolved-seg-after-ambiguous.rs:19:14
|
LL | use self::a::E::in_exist;
@ -25,13 +25,13 @@ note: `E` could also refer to the struct imported here
LL | pub use self::d::*;
| ^^^^^^^^^^
= help: consider adding an explicit import of `E` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default
error: aborting due to 2 previous errors
error: aborting due to 1 previous error; 1 warning emitted
For more information about this error, try `rustc --explain E0432`.
Future incompatibility report: Future breakage diagnostic:
error: `E` is ambiguous
warning: `E` is ambiguous
--> $DIR/unresolved-seg-after-ambiguous.rs:19:14
|
LL | use self::a::E::in_exist;
@ -52,5 +52,5 @@ note: `E` could also refer to the struct imported here
LL | pub use self::d::*;
| ^^^^^^^^^^
= help: consider adding an explicit import of `E` to disambiguate
= note: `#[deny(ambiguous_glob_imports)]` (part of `#[deny(future_incompatible)]`) on by default
= note: `#[warn(ambiguous_glob_imports)]` (part of `#[warn(future_incompatible)]`) on by default