Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 27 insertions, 0 deletions

diff --git a/tests/ui/variance/variance-covariant-self-trait-match.rs b/tests/ui/variance/variance-covariant-self-trait-match.rs
new file mode 100644
index 000000000..93c25e980
--- /dev/null
+++ b/tests/ui/variance/variance-covariant-self-trait-match.rs
@@ -0,0 +1,27 @@
+#![allow(dead_code)]
+
+// Test that even when `Self` is only used in covariant position, it
+// is treated as invariant.
+
+trait Get {
+    fn get() -> Self;
+}
+
+fn get_min_from_max<'min, 'max, G>()
+    where 'max : 'min, G : 'max, &'max G : Get
+{
+    // Previously OK, now an error as traits are invariant.
+    impls_get::<&'min G>();
+    //~^ ERROR lifetime may not live long enough
+}
+
+fn get_max_from_min<'min, 'max, G>()
+    where 'max : 'min, G : 'max, &'min G : Get
+{
+    impls_get::<&'max G>();
+    //~^ ERROR lifetime may not live long enough
+}
+
+fn impls_get<G>() where G : Get { }
+
+fn main() { }