-
Notifications
You must be signed in to change notification settings - Fork 13k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rollup merge of #88501 - m-ou-se:prelude-collusion-oh-no-macros-help,…
… r=estebank Use right span in prelude collision suggestions with macros. Fixes #88347 r? `@estebank`
- Loading branch information
Showing
6 changed files
with
148 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
src/test/ui/rust-2021/future-prelude-collision-macros.fixed
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
// run-rustfix | ||
// edition:2018 | ||
// check-pass | ||
#![warn(rust_2021_prelude_collisions)] | ||
#![allow(unreachable_code)] | ||
|
||
macro_rules! foo { | ||
() => {{ | ||
123; | ||
S | ||
}}; | ||
} | ||
|
||
trait MyTry<T> { | ||
fn try_into(self, _: u8); | ||
} | ||
|
||
struct S; | ||
|
||
impl MyTry<i32> for S { | ||
fn try_into(self, _: u8) {} | ||
} | ||
|
||
trait TryFromU8: Sized { | ||
fn try_from(_: u8); | ||
} | ||
|
||
impl TryFromU8 for u32 { | ||
fn try_from(_: u8) {} | ||
} | ||
|
||
macro_rules! bar { | ||
() => { | ||
u32 | ||
}; | ||
} | ||
|
||
fn main() { | ||
MyTry::try_into(foo!(), todo!()); | ||
//~^ WARNING trait method `try_into` will become ambiguous in Rust 2021 | ||
//~| WARNING this is accepted in the current edition | ||
<bar!() as TryFromU8>::try_from(0); | ||
//~^ WARNING trait-associated function `try_from` will become ambiguous in Rust 2021 | ||
//~| WARNING this is accepted in the current edition | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
// run-rustfix | ||
// edition:2018 | ||
// check-pass | ||
#![warn(rust_2021_prelude_collisions)] | ||
#![allow(unreachable_code)] | ||
|
||
macro_rules! foo { | ||
() => {{ | ||
123; | ||
S | ||
}}; | ||
} | ||
|
||
trait MyTry<T> { | ||
fn try_into(self, _: u8); | ||
} | ||
|
||
struct S; | ||
|
||
impl MyTry<i32> for S { | ||
fn try_into(self, _: u8) {} | ||
} | ||
|
||
trait TryFromU8: Sized { | ||
fn try_from(_: u8); | ||
} | ||
|
||
impl TryFromU8 for u32 { | ||
fn try_from(_: u8) {} | ||
} | ||
|
||
macro_rules! bar { | ||
() => { | ||
u32 | ||
}; | ||
} | ||
|
||
fn main() { | ||
foo!().try_into(todo!()); | ||
//~^ WARNING trait method `try_into` will become ambiguous in Rust 2021 | ||
//~| WARNING this is accepted in the current edition | ||
<bar!()>::try_from(0); | ||
//~^ WARNING trait-associated function `try_from` will become ambiguous in Rust 2021 | ||
//~| WARNING this is accepted in the current edition | ||
} |
25 changes: 25 additions & 0 deletions
25
src/test/ui/rust-2021/future-prelude-collision-macros.stderr
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
warning: trait method `try_into` will become ambiguous in Rust 2021 | ||
--> $DIR/future-prelude-collision-macros.rs:39:5 | ||
| | ||
LL | foo!().try_into(todo!()); | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^ help: disambiguate the associated function: `MyTry::try_into(foo!(), todo!())` | ||
| | ||
note: the lint level is defined here | ||
--> $DIR/future-prelude-collision-macros.rs:4:9 | ||
| | ||
LL | #![warn(rust_2021_prelude_collisions)] | ||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | ||
= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021! | ||
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/prelude.html> | ||
|
||
warning: trait-associated function `try_from` will become ambiguous in Rust 2021 | ||
--> $DIR/future-prelude-collision-macros.rs:42:5 | ||
| | ||
LL | <bar!()>::try_from(0); | ||
| ^^^^^^^^^^^^^^^^^^ help: disambiguate the associated function: `<bar!() as TryFromU8>::try_from` | ||
| | ||
= warning: this is accepted in the current edition (Rust 2018) but is a hard error in Rust 2021! | ||
= note: for more information, see <https://doc.rust-lang.org/nightly/edition-guide/rust-2021/prelude.html> | ||
|
||
warning: 2 warnings emitted | ||
|