tokio-rs/tokio
1
0
Fork 0
mirror of https://github.com/tokio-rs/tokio.git synced 2026-09-08 00:00:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

ci: fix MIRI tests (#5919)

Browse Source 
A change to parking lot or miri resulted in CI breaking.
This commit is contained in:
Carl Lerche
2023-08-08 12:34:19 -07:00
committed by GitHub
parent 51cffbb74f
commit ee44dc98d8
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tokio/src/loom/std/mod.rs
+4 -4
View File
@@ -6,7 +6,7 @@ mod atomic_u64;
mod atomic_usize; mod atomic_usize;
mod barrier; mod barrier;
mod mutex; mod mutex;
#[cfg(feature = "parking_lot")] #[cfg(all(feature = "parking_lot", not(miri)))]
mod parking_lot; mod parking_lot;
mod unsafe_cell; mod unsafe_cell;
@@ -56,17 +56,17 @@ pub(crate) mod sync {
// internal use. Note however that some are not _currently_ named by // internal use. Note however that some are not _currently_ named by
// consuming code. // consuming code.
#[cfg(feature = "parking_lot")] #[cfg(all(feature = "parking_lot", not(miri)))]
#[allow(unused_imports)] #[allow(unused_imports)]
pub(crate) use crate::loom::std::parking_lot::{ pub(crate) use crate::loom::std::parking_lot::{
Condvar, Mutex, MutexGuard, RwLock, RwLockReadGuard, WaitTimeoutResult, Condvar, Mutex, MutexGuard, RwLock, RwLockReadGuard, WaitTimeoutResult,
}; };
#[cfg(not(feature = "parking_lot"))] #[cfg(not(all(feature = "parking_lot", not(miri))))]
#[allow(unused_imports)] #[allow(unused_imports)]
pub(crate) use std::sync::{Condvar, MutexGuard, RwLock, RwLockReadGuard, WaitTimeoutResult}; 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) use crate::loom::std::mutex::Mutex;
pub(crate) mod atomic { pub(crate) mod atomic {