diff options
| author | Samuel Tardieu <sam@rfc1149.net> | 2025-08-05 03:51:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-05 03:51:37 +0200 |
| commit | d2fcd71be658e078a54b3fd84332d67348451240 (patch) | |
| tree | eff1e63137d92c9fb257b6394050f8c2cdefd417 /library/std/src | |
| parent | eee8d775fe27aa376fdecd609203465feac13121 (diff) | |
| parent | 754654d5a98a81a2f4f033a1cf4b2f9e7bb55f06 (diff) | |
| download | rust-d2fcd71be658e078a54b3fd84332d67348451240.tar.gz rust-d2fcd71be658e078a54b3fd84332d67348451240.zip | |
Rollup merge of #144852 - Kivooeo:rename-panic, r=m-ou-se
Rename `rust_panic_without_hook` to `resume_unwind` part of https://github.com/rust-lang/rust/issues/116005 r? libs
Diffstat (limited to 'library/std/src')
| -rw-r--r-- | library/std/src/panic.rs | 2 | ||||
| -rw-r--r-- | library/std/src/panicking.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/library/std/src/panic.rs b/library/std/src/panic.rs index 234fb284a59..913ef72f674 100644 --- a/library/std/src/panic.rs +++ b/library/std/src/panic.rs @@ -388,7 +388,7 @@ pub fn catch_unwind<F: FnOnce() -> R + UnwindSafe, R>(f: F) -> Result<R> { /// ``` #[stable(feature = "resume_unwind", since = "1.9.0")] pub fn resume_unwind(payload: Box<dyn Any + Send>) -> ! { - panicking::rust_panic_without_hook(payload) + panicking::resume_unwind(payload) } /// Makes all future panics abort directly without running the panic hook or unwinding. diff --git a/library/std/src/panicking.rs b/library/std/src/panicking.rs index c2b0e43a324..224cd39855a 100644 --- a/library/std/src/panicking.rs +++ b/library/std/src/panicking.rs @@ -861,7 +861,7 @@ fn panic_with_hook( /// This is the entry point for `resume_unwind`. /// It just forwards the payload to the panic runtime. #[cfg_attr(feature = "panic_immediate_abort", inline)] -pub fn rust_panic_without_hook(payload: Box<dyn Any + Send>) -> ! { +pub fn resume_unwind(payload: Box<dyn Any + Send>) -> ! { panic_count::increase(false); struct RewrapBox(Box<dyn Any + Send>); |