Skip to content

Commit 8d465cc

Browse files
authored
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.
2 parents acf6912 + e3afce8 commit 8d465cc

File tree

1 file changed

+4
-2
lines changed
  • library/std/src/sys/wasm

1 file changed

+4
-2
lines changed

library/std/src/sys/wasm/mod.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,11 @@ cfg_if::cfg_if! {
5252
#[path = "../unix/locks"]
5353
pub mod locks {
5454
#![allow(unsafe_op_in_unsafe_fn)]
55-
mod futex;
55+
mod futex_condvar;
56+
mod futex_mutex;
5657
mod futex_rwlock;
57-
pub(crate) use futex::{Mutex, MovableMutex, Condvar, MovableCondvar};
58+
pub(crate) use futex_condvar::{Condvar, MovableCondvar};
59+
pub(crate) use futex_mutex::{Mutex, MovableMutex};
5860
pub(crate) use futex_rwlock::{RwLock, MovableRwLock};
5961
}
6062
#[path = "atomics/futex.rs"]

0 commit comments

Comments
 (0)