Skip to content

Commit ee44dc9

Browse files
authored
ci: fix MIRI tests (#5919)
A change to parking lot or miri resulted in CI breaking.
1 parent 51cffbb commit ee44dc9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

tokio/src/loom/std/mod.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ mod atomic_u64;
66
mod atomic_usize;
77
mod barrier;
88
mod mutex;
9-
#[cfg(feature = "parking_lot")]
9+
#[cfg(all(feature = "parking_lot", not(miri)))]
1010
mod parking_lot;
1111
mod unsafe_cell;
1212

@@ -56,17 +56,17 @@ pub(crate) mod sync {
5656
// internal use. Note however that some are not _currently_ named by
5757
// consuming code.
5858

59-
#[cfg(feature = "parking_lot")]
59+
#[cfg(all(feature = "parking_lot", not(miri)))]
6060
#[allow(unused_imports)]
6161
pub(crate) use crate::loom::std::parking_lot::{
6262
Condvar, Mutex, MutexGuard, RwLock, RwLockReadGuard, WaitTimeoutResult,
6363
};
6464

65-
#[cfg(not(feature = "parking_lot"))]
65+
#[cfg(not(all(feature = "parking_lot", not(miri))))]
6666
#[allow(unused_imports)]
6767
pub(crate) use std::sync::{Condvar, MutexGuard, RwLock, RwLockReadGuard, WaitTimeoutResult};
6868

69-
#[cfg(not(feature = "parking_lot"))]
69+
#[cfg(not(all(feature = "parking_lot", not(miri))))]
7070
pub(crate) use crate::loom::std::mutex::Mutex;
7171

7272
pub(crate) mod atomic {

0 commit comments

Comments
 (0)