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/panics/panic-handler-flail-wildly.rs b/src/test/ui/panics/panic-handler-flail-wildly.rs
deleted file mode 100644
index 679dc7de8..000000000
--- a/src/test/ui/panics/panic-handler-flail-wildly.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// run-pass
-// needs-unwind
-
-#![allow(stable_features)]
-#![allow(unused_must_use)]
-
-// ignore-emscripten no threads support
-
-#![feature(std_panic)]
-
-use std::panic;
-use std::thread;
-
-fn a() {
-    panic::set_hook(Box::new(|_| println!("hello yes this is a")));
-    panic::take_hook();
-    panic::set_hook(Box::new(|_| println!("hello yes this is a part 2")));
-    panic::take_hook();
-}
-
-fn b() {
-    panic::take_hook();
-    panic::take_hook();
-    panic::take_hook();
-    panic::take_hook();
-    panic::take_hook();
-    panic!();
-}
-
-fn c() {
-    panic::set_hook(Box::new(|_| ()));
-    panic::set_hook(Box::new(|_| ()));
-    panic::set_hook(Box::new(|_| ()));
-    panic::set_hook(Box::new(|_| ()));
-    panic::set_hook(Box::new(|_| ()));
-    panic::set_hook(Box::new(|_| ()));
-    panic!();
-}
-
-fn main() {
-    for _ in 0..10 {
-        let mut handles = vec![];
-        for _ in 0..10 {
-            handles.push(thread::spawn(a));
-        }
-        for _ in 0..10 {
-            handles.push(thread::spawn(b));
-        }
-        for _ in 0..10 {
-            handles.push(thread::spawn(c));
-        }
-        for handle in handles {
-            let _ = handle.join();
-        }
-    }
-}