diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-08-09 13:58:51 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-08-09 13:58:51 +1000 |
| commit | f47557c4a7c40520416a645a414583eacb66cc73 (patch) | |
| tree | 81ab7903e9f50a5b8bb1f99b068e1e9b87ac7b1e /library | |
| parent | 0b289784b39c6de1e037a3d75063747ddc015162 (diff) | |
| parent | c3e504d399a51781f328d4195c79ce9b7d44388d (diff) | |
| download | rust-f47557c4a7c40520416a645a414583eacb66cc73.tar.gz rust-f47557c4a7c40520416a645a414583eacb66cc73.zip | |
Rollup merge of #145096 - Spxg:w/wasm_atomic, r=tgross35
Fix wasm target build with atomics feature Introduced by https://github.com/rust-lang/rust/pull/115746 close https://github.com/rust-lang/rust/issues/145101
Diffstat (limited to 'library')
| -rw-r--r-- | library/std/src/sys/pal/wasm/atomics/thread.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/library/std/src/sys/pal/wasm/atomics/thread.rs b/library/std/src/sys/pal/wasm/atomics/thread.rs index ebfabaafc79..42a7dbdf8b8 100644 --- a/library/std/src/sys/pal/wasm/atomics/thread.rs +++ b/library/std/src/sys/pal/wasm/atomics/thread.rs @@ -56,6 +56,10 @@ impl Thread { pub fn join(self) {} } +pub(crate) fn current_os_id() -> Option<u64> { + None +} + pub fn available_parallelism() -> io::Result<NonZero<usize>> { unsupported() } |