getrandom-js: Merge wasm Custom RNG crates

Signed-off-by: Joe Richey <[email protected]>

Author: josephlr

Cargo.toml

@@ -16,8 +16,7 @@ appveyor = { repository = "rust-random/getrandom" }
 
 [workspace]
 members = [
-    "custom/stdweb",
-    "custom/wasm-bindgen",
+    "custom/js",
 ]
 
 [dependencies]

custom/js/Cargo.toml

@@ -1,20 +1,26 @@
 [package]
-name = "wasm-bindgen-getrandom"
+name = "getrandom-js"
 version = "0.1.0"
 edition = "2018"
 authors = ["The Rand Project Developers"]
 license = "MIT OR Apache-2.0"
-description = "Custom shim for using getrandom with wasm-bindgen"
-documentation = "https://docs.rs/wasm-bindgen-getrandom"
+description = "Custom shim for using getrandom with JavaScript"
+documentation = "https://docs.rs/getrandom-js"
 repository = "https://github.com/rust-random/getrandom"
 categories = ["wasm"]
 
 [dependencies]
 getrandom = { path = "../..", version = "0.2", features = ["custom"] }
-wasm-bindgen = "0.2.46"
+cfg-if = "0.1.2"
 
-[dev-dependencies]
-wasm-bindgen-test = "0.2.46"
+[target.'cfg(cargo_web)'.dependencies]
+stdweb = "0.4.18"
+
+[target.'cfg(not(cargo_web))'.dependencies]
+wasm-bindgen = "0.2.62"
+
+[target.'cfg(not(cargo_web))'.dev-dependencies]
+wasm-bindgen-test = "0.3.12"
 
 [package.metadata.docs.rs]
 default-target = "wasm32-unknown-unknown"

custom/js/src/lib.rs

@@ -0,0 +1,11 @@
+// Necessary to work around complex macros in stdweb
+#![cfg_attr(cargo_web, recursion_limit = "128")]
+
+#[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
+compile_error!("This crate is only for the `wasm32-unknown-unknown` target");
+
+#[cfg_attr(cargo_web, path = "stdweb.rs")]
+#[cfg_attr(not(cargo_web), path = "wasm-bindgen.rs")]
+mod imp;
+
+getrandom::register_custom_getrandom!(imp::getrandom_inner);

custom/js/src/stdweb.rs

@@ -5,16 +5,11 @@
 // <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-
-#![recursion_limit = "128"]
-#[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
-compile_error!("This crate is only for the `wasm32-unknown-unknown` target");
-
 use std::thread_local;
 
 use stdweb::js;
 
-use getrandom::{register_custom_getrandom, Error};
+use getrandom::Error;
 
 #[derive(Clone, Copy, PartialEq)]
 enum RngSource {
@@ -26,9 +21,7 @@ thread_local!(
     static RNG_SOURCE: Result<RngSource, Error> = getrandom_init();
 );
 
-register_custom_getrandom!(getrandom_inner);
-
-fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
+pub(crate) fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
     RNG_SOURCE.with(|&source| getrandom_fill(source?, dest))
 }
 

custom/js/src/wasm-bindgen.rs

@@ -5,15 +5,11 @@
 // <LICENSE-MIT or https://opensource.org/licenses/MIT>, at your
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
-
-#[cfg(not(all(target_arch = "wasm32", target_os = "unknown")))]
-compile_error!("This crate is only for the `wasm32-unknown-unknown` target");
-
 use std::thread_local;
 
 use wasm_bindgen::prelude::*;
 
-use getrandom::{register_custom_getrandom, Error};
+use getrandom::Error;
 
 enum RngSource {
     Node(NodeCrypto),
@@ -26,9 +22,7 @@ thread_local!(
     static RNG_SOURCE: Result<RngSource, Error> = getrandom_init();
 );
 
-register_custom_getrandom!(getrandom_inner);
-
-fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
+pub(crate) fn getrandom_inner(dest: &mut [u8]) -> Result<(), Error> {
     RNG_SOURCE.with(|result| {
         let source = result.as_ref().map_err(|&e| e)?;
 

custom/js/tests/node.rs

@@ -1,7 +1,12 @@
 // Explicitly use the Custom RNG crate to link it in.
-use wasm_bindgen_getrandom as _;
-
 use getrandom::getrandom;
+use getrandom_js as _;
+
+// We don't use wasm_bindgen when building with cargo web
+#[cfg(cargo_web)]
+use test;
+#[cfg(not(cargo_web))]
 use wasm_bindgen_test::wasm_bindgen_test as test;
+
 #[path = "../../../src/test_common.rs"]
 mod test_common;

custom/js/tests/web.rs

@@ -1,9 +1,11 @@
+// Don't use the wasm_bindgen browser framework with cargo web
+#![cfg(not(cargo_web))]
 // Explicitly use the Custom RNG crate to link it in.
-use wasm_bindgen_getrandom as _;
+use getrandom::getrandom;
+use getrandom_js as _;
 
 wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
-
-use getrandom::getrandom;
 use wasm_bindgen_test::wasm_bindgen_test as test;
+
 #[path = "../../../src/test_common.rs"]
 mod test_common;