Merging upstream version 1.68.2+dfsg1.

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

1 files changed, 0 insertions, 56 deletions

diff --git a/src/test/ui/symbol-names/issue-75326.rs b/src/test/ui/symbol-names/issue-75326.rs
deleted file mode 100644
index 4a1f5a212..000000000
--- a/src/test/ui/symbol-names/issue-75326.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// build-fail
-// revisions: legacy v0
-//[legacy]compile-flags: -Z unstable-options -C symbol-mangling-version=legacy
-//[v0]compile-flags: -C symbol-mangling-version=v0
-//[legacy]normalize-stderr-test: "h[\w{16}]+" -> "SYMBOL_HASH"
-
-#![feature(rustc_attrs)]
-
-pub(crate) struct Foo<I, E>(I, E);
-
-pub trait Iterator2 {
-    type Item;
-
-    fn next(&mut self) -> Option<Self::Item>;
-
-    fn find<P>(&mut self, predicate: P) -> Option<Self::Item>
-    where
-        Self: Sized,
-        P: FnMut(&Self::Item) -> bool,
-    {
-        unimplemented!()
-    }
-}
-
-struct Bar;
-
-impl Iterator2 for Bar {
-    type Item = (u32, u16);
-
-    fn next(&mut self) -> Option<Self::Item> {
-        unimplemented!()
-    }
-}
-
-impl<I, T, E> Iterator2 for Foo<I, E>
-where
-    I: Iterator2<Item = (T, E)>,
-{
-    type Item = T;
-
-    #[rustc_symbol_name]
-    //[legacy]~^ ERROR symbol-name(_ZN72_$LT$issue_75326..Foo$LT$I$C$E$GT$$u20$as$u20$issue_75326..Iterator2$GT$4next
-    //[legacy]~| ERROR demangling(<issue_75326::Foo<I,E> as issue_75326::Iterator2>::next
-    //[legacy]~| ERROR demangling-alt(<issue_75326::Foo<I,E> as issue_75326::Iterator2>::next)
-    //[v0]~^^^^  ERROR symbol-name
-    //[v0]~|     ERROR demangling
-    //[v0]~|     ERROR demangling-alt(<issue_75326::Foo<_, _> as issue_75326::Iterator2>::next)
-    fn next(&mut self) -> Option<Self::Item> {
-        self.find(|_| true)
-    }
-}
-
-fn main() {
-    let mut a = Foo(Bar, 1u16);
-    let _ = a.next();
-}