Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 21 deletions

diff --git a/src/test/ui/issues/issue-47309.rs b/src/test/ui/issues/issue-47309.rs
deleted file mode 100644
index abed9687b..000000000
--- a/src/test/ui/issues/issue-47309.rs
+++ /dev/null
@@ -1,21 +0,0 @@
-// Make sure that the mono-item collector does not crash when trying to
-// instantiate a default impl of a method with lifetime parameters.
-// See https://github.com/rust-lang/rust/issues/47309
-
-// compile-flags:-Clink-dead-code
-// build-pass
-
-#![crate_type="rlib"]
-
-pub trait EnvFuture {
-    type Item;
-
-    fn boxed_result<'a>(self) where Self: Sized, Self::Item: 'a, {
-    }
-}
-
-struct Foo;
-
-impl<'a> EnvFuture for &'a Foo {
-    type Item = ();
-}