Add wasm32v1-none support

rust-random · Nov 29, 2024 · a48e020 · a48e020
1 parent 37db8c1
commit a48e020
Show file tree

Hide file tree

Showing 7 changed files with 28 additions and 17 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -1,6 +1,8 @@
 # Allow normal use of "cargo run" and "cargo test" on these wasm32 platforms.
 [target.wasm32-unknown-unknown]
 runner = 'wasm-bindgen-test-runner'
+[target.wasm32v1-unknown]
+runner = 'wasm-bindgen-test-runner'
 [target.wasm32-wasip1]
 runner = 'wasmtime'
 [target.wasm32-wasip2]

diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml
@@ -57,6 +57,14 @@ jobs:
       env:
         RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js" -Ctarget-feature=+atomics,+bulk-memory
       run: cargo clippy -Zbuild-std=core,alloc --target wasm32-unknown-unknown
+    - name: Web WASMv1 (wasm_js.rs)
+      env:
+        RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js"
+      run: cargo clippy -Zbuild-std=core,alloc --target wasm32v1-none
+    - name: Web WASMv1 with atomics (wasm_js.rs)
+      env:
+        RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js" -Ctarget-feature=+atomics,+bulk-memory
+      run: cargo clippy -Zbuild-std=core,alloc --target wasm32v1-none
     - name: Linux (linux_android.rs)
       env:
         RUSTFLAGS: -Dwarnings --cfg getrandom_backend="linux_getrandom"

diff --git a/Cargo.toml b/Cargo.toml
@@ -63,11 +63,11 @@ wasi = { version = "0.13", default-features = false }
 windows-targets = "0.52"
 
 # wasm_js
-[target.'cfg(all(getrandom_backend = "wasm_js", target_arch = "wasm32", target_os = "unknown"))'.dependencies]
+[target.'cfg(all(getrandom_backend = "wasm_js", target_arch = "wasm32", any(target_os = "unknown", target_os = "none")))'.dependencies]
 wasm-bindgen = { version = "0.2.96", default-features = false }
 js-sys = { version = "0.3.73", default-features = false }
 once_cell = { version = "1", default-features = false }
-[target.'cfg(all(getrandom_backend = "wasm_js", getrandom_browser_test, target_arch = "wasm32", target_os = "unknown"))'.dev-dependencies]
+[target.'cfg(all(getrandom_backend = "wasm_js", getrandom_browser_test, target_arch = "wasm32", any(target_os = "unknown", target_os = "none")))'.dev-dependencies]
 wasm-bindgen-test = { version = "0.3", default-features = false }
 
 [features]

diff --git a/README.md b/README.md
@@ -76,15 +76,15 @@ Pull Requests that add support for new targets to `getrandom` are always welcome
 `getrandom` also provides optional (opt-in) backends, which allow users to customize the source
 of randomness based on their specific needs:
 
-| Backend name      | Target               | Target Triple            | Implementation
-| ----------------- | -------------------- | ------------------------ | --------------
-| `linux_getrandom` | Linux, Android       | `*‑linux‑*`              | [`getrandom`][1] system call (without `/dev/urandom` fallback). Bumps minimum supported Linux kernel version to 3.17 and Android API level to 23 (Marshmallow).
-| `linux_rustix`    | Linux, Android       | `*‑linux‑*`              | Same as `linux_getrandom`, but uses [`rustix`] instead of `libc`.
-| `rdrand`          | x86, x86-64          | `x86_64-*`, `i686-*`     | [`RDRAND`] instruction
-| `rndr`            | AArch64              | `aarch64-*`              | [`RNDR`] register
-| `esp_idf`         | ESP-IDF              | `*‑espidf`               | [`esp_fill_random`]. WARNING: can return low-quality entropy without proper hardware configuration!
-| `wasm_js`         | Web Browser, Node.js | `wasm32‑unknown‑unknown` | [`Crypto.getRandomValues`] if available, then [`crypto.randomFillSync`] if on Node.js (see [WebAssembly support])
-| `custom`          | All targets          | `*`                      | User-provided custom implementation (see [custom backend])
+| Backend name      | Target               | Target Triple                             | Implementation
+| ----------------- | -------------------- | ----------------------------------------- | --------------
+| `linux_getrandom` | Linux, Android       | `*‑linux‑*`                               | [`getrandom`][1] system call (without `/dev/urandom` fallback). Bumps minimum supported Linux kernel version to 3.17 and Android API level to 23 (Marshmallow).
+| `linux_rustix`    | Linux, Android       | `*‑linux‑*`                               | Same as `linux_getrandom`, but uses [`rustix`] instead of `libc`.
+| `rdrand`          | x86, x86-64          | `x86_64-*`, `i686-*`                      | [`RDRAND`] instruction
+| `rndr`            | AArch64              | `aarch64-*`                               | [`RNDR`] register
+| `esp_idf`         | ESP-IDF              | `*‑espidf`                                | [`esp_fill_random`]. WARNING: can return low-quality entropy without proper hardware configuration!
+| `wasm_js`         | Web Browser, Node.js | `wasm32‑unknown‑unknown`, `wasm32v1-none` | [`Crypto.getRandomValues`] if available, then [`crypto.randomFillSync`] if on Node.js (see [WebAssembly support])
+| `custom`          | All targets          | `*`                                       | User-provided custom implementation (see [custom backend])
 
 Opt-in backends can be enabled using the `getrandom_backend` configuration flag.
 The flag can be set either by specifying the `rustflags` field in

diff --git a/src/backends.rs b/src/backends.rs
@@ -150,11 +150,12 @@ cfg_if! {
         pub use rdrand::*;
     } else if #[cfg(all(
         target_arch = "wasm32",
-        target_os = "unknown",
+        any(target_os = "unknown", target_os = "none"),
     ))] {
-        compile_error!("the wasm32-unknown-unknown targets are not supported \
-                        by default, you may need to enable the \"wasm_js\" \
-                        configuration flag. For more information see: \
+        compile_error!("the wasm32-unknown-unknown and wasm32v1-none targets \
+                        are not supported by default, you may need to enable \
+                        the \"wasm_js\" configuration flag. For more \
+                        information see: \
                         https://docs.rs/getrandom/#webassembly-support");
     } else {
         compile_error!("target is not supported. You may need to define \

diff --git a/src/backends/wasm_js.rs b/src/backends/wasm_js.rs
@@ -7,7 +7,7 @@ use core::mem::MaybeUninit;
 
 pub use crate::util::{inner_u32, inner_u64};
 
-#[cfg(not(all(target_arch = "wasm32", target_os = "unknown",)))]
+#[cfg(not(all(target_arch = "wasm32", any(target_os = "unknown", target_os = "none"),)))]
 compile_error!("`wasm_js` backend can be enabled only for OS-less WASM targets!");
 
 use js_sys::{global, Function, Uint8Array};

diff --git a/src/lib.rs b/src/lib.rs
@@ -15,7 +15,7 @@
     all(
         getrandom_backend = "wasm_js",
         any(target_arch = "wasm32", target_arch = "wasm64"),
-        target_os = "unknown",
+        any(target_os = "unknown", target_os = "none"),
         not(feature = "std"),
         target_feature = "atomics"
     ),