about summary refs log tree commit diff
diff options
context:
space:
mode:
authorsandydoo <hey@sandydoo.me>2022-07-27 12:32:34 +0400
committersandydoo <hey@sandydoo.me>2022-07-27 12:44:32 +0400
commite3afce8c70ab085ae84da0ed6d42e19f9736667d (patch)
tree7dc9aba4d329e1a85c9333059cee8a8ce0b04a57
parente33cc71a61c91e1d510bf283e9d345067e64eed2 (diff)
downloadrust-e3afce8c70ab085ae84da0ed6d42e19f9736667d.tar.gz
rust-e3afce8c70ab085ae84da0ed6d42e19f9736667d.zip
Fix futex module imports on wasm+atomics
-rw-r--r--library/std/src/sys/wasm/mod.rs6
1 files changed, 4 insertions, 2 deletions
diff --git a/library/std/src/sys/wasm/mod.rs b/library/std/src/sys/wasm/mod.rs
index 55b5ad314da..4159efe2a05 100644
--- a/library/std/src/sys/wasm/mod.rs
+++ b/library/std/src/sys/wasm/mod.rs
@@ -52,9 +52,11 @@ cfg_if::cfg_if! {
         #[path = "../unix/locks"]
         pub mod locks {
             #![allow(unsafe_op_in_unsafe_fn)]
-            mod futex;
+            mod futex_condvar;
+            mod futex_mutex;
             mod futex_rwlock;
-            pub(crate) use futex::{Mutex, MovableMutex, Condvar, MovableCondvar};
+            pub(crate) use futex_condvar::{Condvar, MovableCondvar};
+            pub(crate) use futex_mutex::{Mutex, MovableMutex};
             pub(crate) use futex_rwlock::{RwLock, MovableRwLock};
         }
         #[path = "atomics/futex.rs"]