diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-10-31 13:20:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-31 13:20:04 +0100 |
| commit | 6c5aa765fb64758825fae0371b54ef07c3589e7a (patch) | |
| tree | 2a8f7021e38a2023c9d0a7b5ba029b3a6b7978a1 /library/std/src/rt.rs | |
| parent | 58899c4d9c63a6d27ac395ee9597ae797df7f026 (diff) | |
| parent | 0cc4cce057c0272e1997fc1d684c0b5d417eac4d (diff) | |
| download | rust-6c5aa765fb64758825fae0371b54ef07c3589e7a.tar.gz rust-6c5aa765fb64758825fae0371b54ef07c3589e7a.zip | |
Rollup merge of #89068 - bjorn3:restructure_rt2, r=joshtriplett
Restructure std::rt (part 2) A couple more cleanups on top of https://github.com/rust-lang/rust/pull/89011 Blocked on #89011
Diffstat (limited to 'library/std/src/rt.rs')
| -rw-r--r-- | library/std/src/rt.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/library/std/src/rt.rs b/library/std/src/rt.rs index 121c214780d..08e58257572 100644 --- a/library/std/src/rt.rs +++ b/library/std/src/rt.rs @@ -128,8 +128,7 @@ fn lang_start_internal( let ret_code = panic::catch_unwind(move || panic::catch_unwind(main).unwrap_or(101) as isize) .map_err(move |e| { mem::forget(e); - rtprintpanic!("drop of the panic payload panicked"); - sys::abort_internal() + rtabort!("drop of the panic payload panicked"); }); panic::catch_unwind(cleanup).map_err(rt_abort)?; ret_code |