about summary refs log tree commit diff
diff options
context:
space:
mode:
authorZachary S <zasample18+github@gmail.com>2024-07-03 13:33:32 -0500
committerZachary S <zasample18+github@gmail.com>2024-07-03 13:33:32 -0500
commitb512608275fed67cfccd05bea91d48d708ea7ae9 (patch)
tree230d87b55428d4decf383e5b3ca4caa6118c3e92
parent897fb6cb1ab30900a03a2806d312f9d22e43459c (diff)
downloadrust-b512608275fed67cfccd05bea91d48d708ea7ae9.tar.gz
rust-b512608275fed67cfccd05bea91d48d708ea7ae9.zip
Remove Miri special-case
-rw-r--r--library/std/src/sys/pal/common/exit_guard.rs10
1 files changed, 1 insertions, 9 deletions
diff --git a/library/std/src/sys/pal/common/exit_guard.rs b/library/std/src/sys/pal/common/exit_guard.rs
index 0ea1faacee9..eb2c14cdecc 100644
--- a/library/std/src/sys/pal/common/exit_guard.rs
+++ b/library/std/src/sys/pal/common/exit_guard.rs
@@ -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