Skip to content

Commit

Permalink
ci: fix MIRI tests (#5919)
Browse files Browse the repository at this point in the history
A change to parking lot or miri resulted in CI breaking.
  • Loading branch information
carllerche committed Aug 8, 2023
1 parent 51cffbb commit ee44dc9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions tokio/src/loom/std/mod.rs
Expand Up @@ -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;

Expand Down Expand Up @@ -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 {
Expand Down

0 comments on commit ee44dc9

Please sign in to comment.