Skip to content

Commit d2fcd71

Browse files
Rollup merge of #144852 - Kivooeo:rename-panic, r=m-ou-se
Rename `rust_panic_without_hook` to `resume_unwind` part of #116005 r? libs
2 parents eee8d77 + 754654d commit d2fcd71

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

library/std/src/panic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> {
388388
/// ```
389389
#[stable(feature = "resume_unwind", since = "1.9.0")]
390390
pub fn resume_unwind(payload: Box<dyn Any + Send>) -> ! {
391-
panicking::rust_panic_without_hook(payload)
391+
panicking::resume_unwind(payload)
392392
}
393393

394394
/// Makes all future panics abort directly without running the panic hook or unwinding.

library/std/src/panicking.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -861,7 +861,7 @@ fn panic_with_hook(
861861
/// This is the entry point for `resume_unwind`.
862862
/// It just forwards the payload to the panic runtime.
863863
#[cfg_attr(feature = "panic_immediate_abort", inline)]
864-
pub fn rust_panic_without_hook(payload: Box<dyn Any + Send>) -> ! {
864+
pub fn resume_unwind(payload: Box<dyn Any + Send>) -> ! {
865865
panic_count::increase(false);
866866

867867
struct RewrapBox(Box<dyn Any + Send>);

0 commit comments

Comments
 (0)