projects
/
rust-lightning
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #2985 from TheBlueMatt/2024-03-fix-upgradable-enum-121
[rust-lightning]
/
lightning
/
src
/
sync
/
mod.rs
diff --git
a/lightning/src/sync/mod.rs
b/lightning/src/sync/mod.rs
index 1b2b9a739b8c5d3078204917f55b0fef86e87f13..348bd90274ae1632b1cec63cf98e9249d9ac7425 100644
(file)
--- a/
lightning/src/sync/mod.rs
+++ b/
lightning/src/sync/mod.rs
@@
-3,7
+3,7
@@
pub(crate) enum LockHeldState {
HeldByThread,
NotHeldByThread,
pub(crate) enum LockHeldState {
HeldByThread,
NotHeldByThread,
- #[cfg(any(
feature = "_bench_unstable"
, not(test)))]
+ #[cfg(any(
ldk_bench
, not(test)))]
Unsupported,
}
Unsupported,
}
@@
-20,20
+20,20
@@
pub(crate) trait LockTestExt<'a> {
fn unsafe_well_ordered_double_lock_self(&'a self) -> Self::ExclLock;
}
fn unsafe_well_ordered_double_lock_self(&'a self) -> Self::ExclLock;
}
-#[cfg(all(feature = "std", not(
feature = "_bench_unstable"
), test))]
+#[cfg(all(feature = "std", not(
ldk_bench
), test))]
mod debug_sync;
mod debug_sync;
-#[cfg(all(feature = "std", not(
feature = "_bench_unstable"
), test))]
+#[cfg(all(feature = "std", not(
ldk_bench
), test))]
pub use debug_sync::*;
pub use debug_sync::*;
-#[cfg(all(feature = "std", not(
feature = "_bench_unstable"
), test))]
+#[cfg(all(feature = "std", not(
ldk_bench
), test))]
// Note that to make debug_sync's regex work this must not contain `debug_string` in the module name
mod test_lockorder_checks;
// Note that to make debug_sync's regex work this must not contain `debug_string` in the module name
mod test_lockorder_checks;
-#[cfg(all(feature = "std", any(
feature = "_bench_unstable"
, not(test))))]
+#[cfg(all(feature = "std", any(
ldk_bench
, not(test))))]
pub(crate) mod fairrwlock;
pub(crate) mod fairrwlock;
-#[cfg(all(feature = "std", any(
feature = "_bench_unstable"
, not(test))))]
+#[cfg(all(feature = "std", any(
ldk_bench
, not(test))))]
pub use {std::sync::{Arc, Mutex, Condvar, MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard}, fairrwlock::FairRwLock};
pub use {std::sync::{Arc, Mutex, Condvar, MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard}, fairrwlock::FairRwLock};
-#[cfg(all(feature = "std", any(
feature = "_bench_unstable"
, not(test))))]
+#[cfg(all(feature = "std", any(
ldk_bench
, not(test))))]
mod ext_impl {
use super::*;
impl<'a, T: 'a> LockTestExt<'a> for Mutex<T> {
mod ext_impl {
use super::*;
impl<'a, T: 'a> LockTestExt<'a> for Mutex<T> {