Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 30 deletions

diff --git a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.fixed b/src/test/ui/rust-2021/future-prelude-collision-generic-trait.fixed
deleted file mode 100644
index a1b6f5b16..000000000
--- a/src/test/ui/rust-2021/future-prelude-collision-generic-trait.fixed
+++ /dev/null
@@ -1,30 +0,0 @@
-// See https://github.com/rust-lang/rust/issues/88470
-// run-rustfix
-// edition:2018
-// check-pass
-#![warn(rust_2021_prelude_collisions)]
-#![allow(dead_code)]
-#![allow(unused_imports)]
-
-pub trait PyTryFrom<'v, T>: Sized {
-    fn try_from<V>(value: V) -> Result<&'v Self, T>;
-}
-
-pub trait PyTryInto<T>: Sized {
-    fn try_into(&self) -> Result<&T, i32>;
-}
-
-struct Foo;
-
-impl<U> PyTryInto<U> for Foo
-where
-    U: for<'v> PyTryFrom<'v, i32>,
-{
-    fn try_into(&self) -> Result<&U, i32> {
-        <U as PyTryFrom<'_, _>>::try_from(self)
-        //~^ WARNING trait-associated function `try_from` will become ambiguous in Rust 2021
-        //~| this is accepted in the current edition (Rust 2018)
-    }
-}
-
-fn main() {}