Merging upstream version 1.70.0+dfsg1.

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

1 files changed, 14 insertions, 0 deletions

diff --git a/tests/ui/generics/slightly-nice-generic-literal-messages.rs b/tests/ui/generics/slightly-nice-generic-literal-messages.rs
new file mode 100644
index 000000000..268009f65
--- /dev/null
+++ b/tests/ui/generics/slightly-nice-generic-literal-messages.rs
@@ -0,0 +1,14 @@
+use std::marker;
+
+struct Foo<T,U>(T, marker::PhantomData<U>);
+
+fn main() {
+    match Foo(1.1, marker::PhantomData) {
+        1 => {}
+    //~^ ERROR mismatched types
+    //~| expected struct `Foo<{float}, _>`
+    //~| found type `{integer}`
+    //~| expected `Foo<{float}, _>`, found integer
+    }
+
+}