Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 25 insertions, 0 deletions

diff --git a/tests/ui/issues/issue-57362-2.rs b/tests/ui/issues/issue-57362-2.rs
new file mode 100644
index 000000000..a0b0ea1d0
--- /dev/null
+++ b/tests/ui/issues/issue-57362-2.rs
@@ -0,0 +1,25 @@
+// Test for issue #57362, ensuring that the self ty is shown in cases of higher-ranked lifetimes
+// conflicts: the `expected` and `found` trait refs would otherwise be printed the same, leading
+// to confusing notes such as:
+//  = note: expected type `Trait`
+//             found type `Trait`
+
+// extracted from a similar issue: #57642
+trait X {
+    type G;
+    fn make_g() -> Self::G;
+}
+
+impl<'a> X for fn(&'a ()) {
+    type G = &'a ();
+
+    fn make_g() -> Self::G {
+        &()
+    }
+}
+
+fn g() {
+    let x = <fn (&())>::make_g(); //~ ERROR the function
+}
+
+fn main() {}