From 42a44a04ee1b2a99ea78e942937b4ce3d8a3067e Mon Sep 17 00:00:00 2001 From: Christopher Durham Date: Sun, 15 Sep 2024 14:27:24 -0400 Subject: [PATCH] simplify abort_unwind Co-authored-by: David Tolnay --- library/core/src/panic.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/library/core/src/panic.rs b/library/core/src/panic.rs index 3919bbd7958..c95a000561c 100644 --- a/library/core/src/panic.rs +++ b/library/core/src/panic.rs @@ -160,14 +160,9 @@ pub macro unreachable_2021 { /// to prevent unwinds. However, note that `extern "C" fn` will automatically /// convert unwinds to aborts, so using this function isn't necessary for FFI. #[unstable(feature = "abort_unwind", issue = "130338")] +#[rustc_nounwind] pub fn abort_unwind R, R>(f: F) -> R { - // This attribute adds the "unwinding out of nounwind function" guard. - #[rustc_nounwind] - fn abort_unwind_inner R, R>(f: F) -> R { - f() - } - - abort_unwind_inner(f) + f() } /// An internal trait used by std to pass data from std to `panic_unwind` and