diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2021-06-21 10:58:10 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2021-06-21 11:22:17 -0400 |
| commit | 3dc47e2c098e0b80019e2e1ca622d6af504f6494 (patch) | |
| tree | 466b2c66381583cf73dce9a6afc4658f8e22357f | |
| parent | b18704dd58047e0ade59a425740b8a41ba1bd14b (diff) | |
| download | rust-3dc47e2c098e0b80019e2e1ca622d6af504f6494.tar.gz rust-3dc47e2c098e0b80019e2e1ca622d6af504f6494.zip | |
do not run rustfix for future-prelude-collision-shadow
3 files changed, 1 insertions, 35 deletions
diff --git a/src/test/ui/rust-2021/future-prelude-collision-shadow.fixed b/src/test/ui/rust-2021/future-prelude-collision-shadow.fixed deleted file mode 100644 index 588ab6255fa..00000000000 --- a/src/test/ui/rust-2021/future-prelude-collision-shadow.fixed +++ /dev/null @@ -1,33 +0,0 @@ -// run-rustfix -// edition:2018 -#![warn(future_prelude_collision)] -#![allow(dead_code)] -#![allow(unused_imports)] - -mod m { - pub trait TryIntoU32 { - fn try_into(self) -> Result<u32, ()>; - } - - impl TryIntoU32 for u8 { - fn try_into(self) -> Result<u32, ()> { - Ok(self as u32) - } - } - - pub trait AnotherTrick {} -} - -mod d { - use crate::m::AnotherTrick as TryIntoU32; - use crate::m::*; - - fn main() { - // Here, `TryIntoU32` is imported but shadowed, but in that case we don't permit its methods - // to be available. - let _: u32 = 3u8.try_into().unwrap(); - //~^ ERROR no method named `try_into` found for type `u8` in the current scope - } -} - -fn main() {} diff --git a/src/test/ui/rust-2021/future-prelude-collision-shadow.rs b/src/test/ui/rust-2021/future-prelude-collision-shadow.rs index 588ab6255fa..c9d2529341f 100644 --- a/src/test/ui/rust-2021/future-prelude-collision-shadow.rs +++ b/src/test/ui/rust-2021/future-prelude-collision-shadow.rs @@ -1,4 +1,3 @@ -// run-rustfix // edition:2018 #![warn(future_prelude_collision)] #![allow(dead_code)] diff --git a/src/test/ui/rust-2021/future-prelude-collision-shadow.stderr b/src/test/ui/rust-2021/future-prelude-collision-shadow.stderr index 3019b2aa5e2..ad9b8af00e4 100644 --- a/src/test/ui/rust-2021/future-prelude-collision-shadow.stderr +++ b/src/test/ui/rust-2021/future-prelude-collision-shadow.stderr @@ -1,5 +1,5 @@ error[E0599]: no method named `try_into` found for type `u8` in the current scope - --> $DIR/future-prelude-collision-shadow.rs:28:26 + --> $DIR/future-prelude-collision-shadow.rs:27:26 | LL | let _: u32 = 3u8.try_into().unwrap(); | ^^^^^^^^ method not found in `u8` |