Skip to content

Commit

Permalink
Rollup merge of rust-lang#99800 - sandydoo:bugfix/wasm-futex, r=m-ou-se
Browse files Browse the repository at this point in the history
Fix futex module imports on wasm+atomics

The futex modules were rearranged a bit in rust-lang#98707, which meant that wasm+atomics would no longer compile on nightly. I don’t believe any other targets were impacted by this.
  • Loading branch information
Dylan-DPC authored Aug 3, 2022
2 parents acf6912 + e3afce8 commit 8d465cc
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions library/std/src/sys/wasm/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down

0 comments on commit 8d465cc

Please sign in to comment.