Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 23 deletions

diff --git a/src/test/ui/variance/variance-use-invariant-struct-1.rs b/src/test/ui/variance/variance-use-invariant-struct-1.rs
deleted file mode 100644
index 72f50f345..000000000
--- a/src/test/ui/variance/variance-use-invariant-struct-1.rs
+++ /dev/null
@@ -1,23 +0,0 @@
-// Test various uses of structs with distinct variances to make sure
-// they permit lifetimes to be approximated as expected.
-
-struct SomeStruct<T>(*mut T);
-
-fn foo<'min,'max>(v: SomeStruct<&'max ()>)
-                  -> SomeStruct<&'min ()>
-    where 'max : 'min
-{
-    v
-    //~^ ERROR lifetime may not live long enough
-}
-
-fn bar<'min,'max>(v: SomeStruct<&'min ()>)
-                  -> SomeStruct<&'max ()>
-    where 'max : 'min
-{
-    v
-    //~^ ERROR lifetime may not live long enough
-}
-
-
-fn main() { }