Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 25 deletions

diff --git a/src/test/ui/issues/issue-57362-2.rs b/src/test/ui/issues/issue-57362-2.rs
deleted file mode 100644
index a0b0ea1d0..000000000
--- a/src/test/ui/issues/issue-57362-2.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// 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() {}