Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 23 insertions, 0 deletions

diff --git a/tests/ui/lub-glb/old-lub-glb-object.rs b/tests/ui/lub-glb/old-lub-glb-object.rs
new file mode 100644
index 000000000..b6ead9c68
--- /dev/null
+++ b/tests/ui/lub-glb/old-lub-glb-object.rs
@@ -0,0 +1,23 @@
+// Test that we give a note when the old LUB/GLB algorithm would have
+// succeeded but the new code (which is stricter) gives an error.
+
+trait Foo<T, U> {}
+
+fn foo(x: &dyn for<'a, 'b> Foo<&'a u8, &'b u8>, y: &dyn for<'a> Foo<&'a u8, &'a u8>) {
+    let z = match 22 {
+        0 => x,
+        _ => y,
+        //~^ ERROR mismatched types
+        //~| ERROR mismatched types
+    };
+}
+
+fn bar(x: &dyn for<'a, 'b> Foo<&'a u8, &'b u8>, y: &dyn for<'a> Foo<&'a u8, &'a u8>) {
+    // Accepted with explicit case:
+    let z = match 22 {
+        0 => x as &dyn for<'a> Foo<&'a u8, &'a u8>,
+        _ => y,
+    };
+}
+
+fn main() {}