diff options
| author | Zachary S <zasample18+github@gmail.com> | 2024-07-05 16:59:57 -0500 |
|---|---|---|
| committer | Zachary S <zasample18+github@gmail.com> | 2024-07-05 17:01:08 -0500 |
| commit | a6093701437be909614bc49d63406dfaa63d3b13 (patch) | |
| tree | 72b353349bc310dcc9f5d3ab4fc3f76e73b4a4fc | |
| parent | 9de76e3201a557f0ea9b076c8b38629c5f2b60d0 (diff) | |
| download | rust-a6093701437be909614bc49d63406dfaa63d3b13.tar.gz rust-a6093701437be909614bc49d63406dfaa63d3b13.zip | |
Move exit guard from sys::common::exit_guard to sys::exit_guard.
| -rw-r--r-- | library/std/src/rt.rs | 3 | ||||
| -rw-r--r-- | library/std/src/sys/exit_guard.rs (renamed from library/std/src/sys/pal/common/exit_guard.rs) | 0 | ||||
| -rw-r--r-- | library/std/src/sys/mod.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/pal/common/mod.rs | 1 | ||||
| -rw-r--r-- | library/std/src/sys/pal/unix/os.rs | 2 |
5 files changed, 3 insertions, 4 deletions
diff --git a/library/std/src/rt.rs b/library/std/src/rt.rs index 8a6f3fe291a..c0a1c5f5594 100644 --- a/library/std/src/rt.rs +++ b/library/std/src/rt.rs @@ -146,8 +146,7 @@ fn lang_start_internal( panic::catch_unwind(cleanup).map_err(rt_abort)?; // Guard against multple threads calling `libc::exit` concurrently. // See the documentation for `unique_thread_exit` for more information. - panic::catch_unwind(|| crate::sys::common::exit_guard::unique_thread_exit()) - .map_err(rt_abort)?; + panic::catch_unwind(|| crate::sys::exit_guard::unique_thread_exit()).map_err(rt_abort)?; ret_code } diff --git a/library/std/src/sys/pal/common/exit_guard.rs b/library/std/src/sys/exit_guard.rs index a1b0309b003..a1b0309b003 100644 --- a/library/std/src/sys/pal/common/exit_guard.rs +++ b/library/std/src/sys/exit_guard.rs diff --git a/library/std/src/sys/mod.rs b/library/std/src/sys/mod.rs index 8aa35c40fe0..22ebc979bf7 100644 --- a/library/std/src/sys/mod.rs +++ b/library/std/src/sys/mod.rs @@ -3,6 +3,7 @@ /// descriptors. mod pal; +pub(crate) mod exit_guard; mod personality; pub mod backtrace; diff --git a/library/std/src/sys/pal/common/mod.rs b/library/std/src/sys/pal/common/mod.rs index cc1dceb63e2..29fc0835d76 100644 --- a/library/std/src/sys/pal/common/mod.rs +++ b/library/std/src/sys/pal/common/mod.rs @@ -11,7 +11,6 @@ #![allow(dead_code)] pub mod alloc; -pub mod exit_guard; pub mod small_c_string; #[cfg(test)] diff --git a/library/std/src/sys/pal/unix/os.rs b/library/std/src/sys/pal/unix/os.rs index 3f598a095c1..397a0debe58 100644 --- a/library/std/src/sys/pal/unix/os.rs +++ b/library/std/src/sys/pal/unix/os.rs @@ -758,7 +758,7 @@ pub fn home_dir() -> Option<PathBuf> { } pub fn exit(code: i32) -> ! { - crate::sys::common::exit_guard::unique_thread_exit(); + crate::sys::exit_guard::unique_thread_exit(); unsafe { libc::exit(code as c_int) } } |