rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rollup merge of #89068 - bjorn3:restructure_rt2, r=joshtriplett

Browse Source 
Restructure std::rt (part 2)

A couple more cleanups on top of https://github.com/rust-lang/rust/pull/89011

Blocked on #89011
This commit is contained in:
Matthias Krüger
2021-10-31 13:20:04 +01:00
committed by GitHub
parent 58899c4d9c 0cc4cce057
commit 6c5aa765fb
4 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/std/src/rt.rs
View File

@@ -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