diff options
| author | Dylan DPC <99973273+Dylan-DPC@users.noreply.github.com> | 2022-08-03 13:45:52 +0530 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-03 13:45:52 +0530 |
| commit | 8d465cc551fb10893d6f33fa3fca716a39408642 (patch) | |
| tree | 8ad48471f61de303f8e3403f2037cbb62c4b024d /library/std/src/sys | |
| parent | acf691234fbf5dbd931500df3e479b9b39acf740 (diff) | |
| parent | e3afce8c70ab085ae84da0ed6d42e19f9736667d (diff) | |
| download | rust-8d465cc551fb10893d6f33fa3fca716a39408642.tar.gz rust-8d465cc551fb10893d6f33fa3fca716a39408642.zip | |
Rollup merge of #99800 - sandydoo:bugfix/wasm-futex, r=m-ou-se
Fix futex module imports on wasm+atomics The futex modules were rearranged a bit in #98707, which meant that wasm+atomics would no longer compile on nightly. I don’t believe any other targets were impacted by this.
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/wasm/mod.rs | 6 |
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"] |