Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 0 insertions, 32 deletions

diff --git a/src/test/ui/rust-2021/future-prelude-collision-shadow.rs b/src/test/ui/rust-2021/future-prelude-collision-shadow.rs
deleted file mode 100644
index 27891a8d1..000000000
--- a/src/test/ui/rust-2021/future-prelude-collision-shadow.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-// edition:2018
-#![warn(rust_2021_prelude_collisions)]
-#![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() {}