ci: fix MIRI tests (#5919)

A change to parking lot or miri resulted in CI breaking.
tokio-rs · Aug 8, 2023 · ee44dc9 · ee44dc9
1 parent 51cffbb
commit ee44dc9
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/tokio/src/loom/std/mod.rs b/tokio/src/loom/std/mod.rs
@@ -6,7 +6,7 @@ mod atomic_u64;
 mod atomic_usize;
 mod barrier;
 mod mutex;
-#[cfg(feature = "parking_lot")]
+#[cfg(all(feature = "parking_lot", not(miri)))]
 mod parking_lot;
 mod unsafe_cell;
 
@@ -56,17 +56,17 @@ pub(crate) mod sync {
     // internal use. Note however that some are not _currently_ named by
     // consuming code.
 
-    #[cfg(feature = "parking_lot")]
+    #[cfg(all(feature = "parking_lot", not(miri)))]
     #[allow(unused_imports)]
     pub(crate) use crate::loom::std::parking_lot::{
         Condvar, Mutex, MutexGuard, RwLock, RwLockReadGuard, WaitTimeoutResult,
     };
 
-    #[cfg(not(feature = "parking_lot"))]
+    #[cfg(not(all(feature = "parking_lot", not(miri))))]
     #[allow(unused_imports)]
     pub(crate) use std::sync::{Condvar, MutexGuard, RwLock, RwLockReadGuard, WaitTimeoutResult};
 
-    #[cfg(not(feature = "parking_lot"))]
+    #[cfg(not(all(feature = "parking_lot", not(miri))))]
     pub(crate) use crate::loom::std::mutex::Mutex;
 
     pub(crate) mod atomic {