Skip to content

Commit 47d0cbc

Browse files
committed
Remove Miri special-case
1 parent 596be7e commit 47d0cbc

File tree

1 file changed

+1
-9
lines changed

1 file changed

+1
-9
lines changed

std/src/sys/pal/common/exit_guard.rs

+1-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
cfg_if::cfg_if! {
2-
if #[cfg(miri)] {
3-
/// Mitigation for <https://github.com/rust-lang/rust/issues/126600>
4-
///
5-
/// This mitigation is not necessary when running under Miri, so this function does nothing
6-
/// when running under Miri.
7-
pub(crate) fn unique_thread_exit() {
8-
// Mitigation not required on Miri, where `exit` is thread-safe.
9-
}
10-
} else if #[cfg(target_os = "linux")] {
2+
if #[cfg(target_os = "linux")] {
113
/// Mitigation for <https://github.com/rust-lang/rust/issues/126600>
124
///
135
/// On UNIX-like platforms (where `libc::exit` may not be thread-safe), ensure that only one

0 commit comments

Comments
 (0)