Skip to content

Commit

Permalink
Remove Miri special-case
Browse files Browse the repository at this point in the history
  • Loading branch information
zachs18 committed Jul 3, 2024
1 parent 596be7e commit 47d0cbc
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions std/src/sys/pal/common/exit_guard.rs
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
cfg_if::cfg_if! {
if #[cfg(miri)] {
/// Mitigation for <https://github.com/rust-lang/rust/issues/126600>
///
/// This mitigation is not necessary when running under Miri, so this function does nothing
/// when running under Miri.
pub(crate) fn unique_thread_exit() {
// Mitigation not required on Miri, where `exit` is thread-safe.
}
} else if #[cfg(target_os = "linux")] {
if #[cfg(target_os = "linux")] {
/// Mitigation for <https://github.com/rust-lang/rust/issues/126600>
///
/// On UNIX-like platforms (where `libc::exit` may not be thread-safe), ensure that only one
Expand Down

0 comments on commit 47d0cbc

Please sign in to comment.