Skip to content

Add core::panic::abort_unwind #130339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 3 commits into from
Sep 15, 2024
Merged

Add core::panic::abort_unwind #130339

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de66d3a
add core::panic::abort_unwind
CAD97 Sep 14, 2024
7e7ccb2
add std::panic::abort_unwind
CAD97 Sep 14, 2024
42a44a0
simplify abort_unwind
CAD97 Sep 15, 2024
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
simplify abort_unwind 
Co-authored-by: David Tolnay <dtolnay@gmail.com>
  • Loading branch information
@CAD97 @dtolnay
CAD97 and dtolnay authored Sep 15, 2024
commit 42a44a04ee1b2a99ea78e942937b4ce3d8a3067e
9 changes: 2 additions & 7 deletions library/core/src/panic.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<F: FnOnce() -> R, R>(f: F) -> R {
// This attribute adds the "unwinding out of nounwind function" guard.
#[rustc_nounwind]
fn abort_unwind_inner<F: FnOnce() -> 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
Expand Down