nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 14:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Once from init

Browse Source
This commit is contained in:
Christiaan Dirkx 2021-04-21 16:21:10 +02:00
parent e1b1081d2f
commit 7171fec13f
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,8 +28,11 @@ fn lang_start_internal(
use crate::panic;
use crate::sys_common;
sys_common::rt::init(argc, argv);
// SAFETY: Only called once during runtime initialization.
unsafe { sys_common::rt::init(argc, argv) };
let exit_code = panic::catch_unwind(main);
sys_common::rt::cleanup();
exit_code.unwrap_or(101) as isize

11
library/std/src/sys_common/rt.rs
View File

@ -1,3 +1,5 @@
#![deny(unsafe_op_in_unsafe_fn)]
use crate::sync::Once;
use crate::sys;
use crate::sys_common::thread_info;
@ -5,12 +7,11 @@ use crate::thread::Thread;
// One-time runtime initialization.
// Runs before `main`.
// SAFETY: must be called only once during runtime initialization.
// NOTE: this is not guaranteed to run, for example when Rust code is called externally.
#[cfg_attr(test, allow(dead_code))]
pub fn init(argc: isize, argv: *const *const u8) {
static INIT: Once = Once::new();
INIT.call_once(|| unsafe {
// SAFETY: Only called once during runtime initialization.
pub unsafe fn init(argc: isize, argv: *const *const u8) {
unsafe {
sys::init(argc, argv);
let main_guard = sys::thread::guard::init();
@ -20,7 +21,7 @@ pub fn init(argc: isize, argv: *const *const u8) {
// info about the stack bounds.
let thread = Thread::new(Some("main".to_owned()));
thread_info::set(main_guard, thread);
});
}
}
// One-time runtime cleanup.