Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 33 deletions

diff --git a/src/test/ui/generic-associated-types/projection-type-lifetime-mismatch.rs b/src/test/ui/generic-associated-types/projection-type-lifetime-mismatch.rs
deleted file mode 100644
index 8e4d5ca5e..000000000
--- a/src/test/ui/generic-associated-types/projection-type-lifetime-mismatch.rs
+++ /dev/null
@@ -1,33 +0,0 @@
-pub trait X {
-    type Y<'a> where Self: 'a;
-    fn m(&self) -> Self::Y<'_>;
-}
-
-impl X for () {
-    type Y<'a> = &'a ();
-
-    fn m(&self) -> Self::Y<'_> {
-        self
-    }
-}
-
-fn f(x: &impl for<'a> X<Y<'a> = &'a ()>) -> &'static () {
-    x.m()
-    //~^ ERROR lifetime may not live long enough
-}
-
-fn g<T: for<'a> X<Y<'a> = &'a ()>>(x: &T) -> &'static () {
-    x.m()
-    //~^ ERROR lifetime may not live long enough
-}
-
-fn h(x: &()) -> &'static () {
-    x.m()
-    //~^ ERROR lifetime may not live long enough
-}
-
-fn main() {
-    f(&());
-    g(&());
-    h(&());
-}