Merge pull request #1944 from TheBlueMatt/2022-01-lockorder-windows-robust

[rust-lightning] / lightning / src / sync / mod.rs

diff --git a/lightning/src/sync/mod.rs b/lightning/src/sync/mod.rs
index 584338031fc060bd5178a2321802767c5792101c..f7226a5fa34eef114d27c6569207dbc68354b950 100644 (file)
--- a/lightning/src/sync/mod.rs
+++ b/lightning/src/sync/mod.rs
@@ -1,5 +1,11 @@
 #[cfg(all(feature = "std", not(feature = "_bench_unstable"), test))]
-pub use crate::debug_sync::*;
+mod debug_sync;
+#[cfg(all(feature = "std", not(feature = "_bench_unstable"), test))]
+pub use debug_sync::*;
+#[cfg(all(feature = "std", not(feature = "_bench_unstable"), test))]
+// 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))))]
 pub use ::std::sync::{Arc, Mutex, Condvar, MutexGuard, RwLock, RwLockReadGuard, RwLockWriteGuard};
 #[cfg(all(feature = "std", any(feature = "_bench_unstable", not(test))))]