Merge pull request #1725 from TheBlueMatt/2022-09-no-bench-lockorder

Stop building with lockorder debugging in benchmarks
This commit is contained in:
valentinewallace 2022-09-16 17:12:49 -04:00 committed by GitHub
commit dc28f9bb88
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 6 deletions

View file

@ -173,18 +173,18 @@ mod prelude {
pub use alloc::string::ToString;
}
#[cfg(all(feature = "std", test))]
#[cfg(all(not(feature = "_bench_unstable"), feature = "std", test))]
mod debug_sync;
#[cfg(all(feature = "backtrace", feature = "std", test))]
#[cfg(all(not(feature = "_bench_unstable"), feature = "backtrace", feature = "std", test))]
extern crate backtrace;
#[cfg(feature = "std")]
mod sync {
#[cfg(test)]
#[cfg(all(not(feature = "_bench_unstable"), test))]
pub use debug_sync::*;
#[cfg(not(test))]
#[cfg(any(feature = "_bench_unstable", not(test)))]
pub use ::std::sync::{Arc, Mutex, Condvar, MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard};
#[cfg(not(test))]
#[cfg(any(feature = "_bench_unstable", not(test)))]
pub use crate::util::fairrwlock::FairRwLock;
}

View file

@ -26,7 +26,7 @@ pub mod wakers;
pub(crate) mod atomic_counter;
pub(crate) mod byte_utils;
pub(crate) mod chacha20;
#[cfg(all(not(test), feature = "std"))]
#[cfg(all(any(feature = "_bench_unstable", not(test)), feature = "std"))]
pub(crate) mod fairrwlock;
#[cfg(fuzzing)]
pub mod zbase32;