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-68696-catch-during-unwind.rs b/src/test/ui/issues/issue-68696-catch-during-unwind.rs
deleted file mode 100644
index 2b12a62d0..000000000
--- a/src/test/ui/issues/issue-68696-catch-during-unwind.rs
+++ /dev/null
@@ -1,25 +0,0 @@
-// Checks that catch_unwind can be used if unwinding is already in progress.
-// Used to fail when standard library had been compiled with debug assertions,
-// due to incorrect assumption that a current thread is not panicking when
-// entering the catch_unwind.
-//
-// run-pass
-
-use std::panic::catch_unwind;
-
-#[derive(Default)]
-struct Guard;
-
-impl Drop for Guard {
-    fn drop(&mut self) {
-        let _ = catch_unwind(|| {});
-    }
-}
-
-fn main() {
-    #[cfg(panic = "unwind")]
-    let _ = catch_unwind(|| {
-        let _guard = Guard::default();
-        panic!();
-    });
-}