diff options
| author | bors <bors@rust-lang.org> | 2020-11-15 02:21:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-11-15 02:21:18 +0000 |
| commit | 75042566d1c90d912f22e4db43b6d3af98447986 (patch) | |
| tree | 59ffa44ee35633cf8ff80b132e2cf0919c3dd787 /library/std/src/sys | |
| parent | 361c4ea22486557ec50c4fc6a93d60e7476ecbea (diff) | |
| parent | 96515ccc7a41cc8968ee742cb4d65205582e0fe9 (diff) | |
| download | rust-75042566d1c90d912f22e4db43b6d3af98447986.tar.gz rust-75042566d1c90d912f22e4db43b6d3af98447986.zip | |
Auto merge of #79065 - Dylan-DPC:rollup-gag1drk, r=Dylan-DPC
Rollup of 15 pull requests Successful merges: - #78352 (Do not call `unwrap` with `signatures` option enabled) - #78590 (refactor: removing alloc::collections::vec_deque ignore-tidy-filelength) - #78848 (Bump minimal supported LLVM version to 9) - #78856 (Explicitly checking for or-pattern before test) - #78948 (test: add `()=()=()=...` to weird-exprs.rs) - #78962 (Add a test for r# identifiers) - #78963 (Added some unit tests as requested) - #78966 (Never inline C variadics, cold functions, functions with incompatible attributes ...) - #78968 (Include llvm-as in llvm-tools-preview component) - #78969 (Normalize function type during validation) - #78980 (Fix rustc_ast_pretty print_qpath resulting in invalid macro input) - #78986 (Avoid installing external LLVM dylibs) - #78988 (Fix an intrinsic invocation on threaded wasm) - #78993 (rustc_target: Fix dash vs underscore mismatches in option names) - #79013 (Clean up outdated `use_once_payload` pretty printer comment) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/std/src/sys')
| -rw-r--r-- | library/std/src/sys/wasm/mutex_atomics.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/std/src/sys/wasm/mutex_atomics.rs b/library/std/src/sys/wasm/mutex_atomics.rs index 479182ffa44..5ff0ec052b6 100644 --- a/library/std/src/sys/wasm/mutex_atomics.rs +++ b/library/std/src/sys/wasm/mutex_atomics.rs @@ -138,7 +138,7 @@ impl ReentrantMutex { self.owner.swap(0, SeqCst); // SAFETY: the caller must gurantee that `self.ptr()` is valid i32. unsafe { - wasm32::atomic_notify(self.ptr() as *mut i32, 1); + wasm32::memory_atomic_notify(self.ptr() as *mut i32, 1); } // wake up one waiter, if any } ref mut n => *n -= 1, |