Merge branch '0.5'

Author: dhardy

CHANGELOG.md

@@ -8,6 +8,10 @@ A [separate changelog is kept for rand_core](rand_core/CHANGELOG.md).
 
 You may also find the [Update Guide](UPDATING.md) useful.
 
+## [0.5.4] - 2018-07-11
+### Platform support
+- Make `OsRng` work via WASM/stdweb for WebWorkers
+
 ## [0.5.3] - 2018-06-26
 ### Platform support
 - OpenBSD, Bitrig: fix compilation (broken in 0.5.1) (#530)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rand"
-version = "0.5.3" # NB: When modifying, also modify html_root_url in lib.rs
+version = "0.5.4" # NB: When modifying, also modify html_root_url in lib.rs
 authors = ["The Rust Project Developers"]
 license = "MIT/Apache-2.0"
 readme = "README.md"

src/lib.rs

@@ -218,7 +218,7 @@
 
 #![doc(html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk.png",
        html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-       html_root_url = "https://docs.rs/rand/0.5.3")]
+       html_root_url = "https://docs.rs/rand/0.5.4")]
 
 #![deny(missing_docs)]
 #![deny(missing_debug_implementations)]

src/rngs/os.rs

@@ -1023,9 +1023,9 @@ mod imp {
             let result = js! {
                 try {
                     if (
-                        typeof window === "object" &&
-                        typeof window.crypto === "object" &&
-                        typeof window.crypto.getRandomValues === "function"
+                        typeof self === "object" &&
+                        typeof self.crypto === "object" &&
+                        typeof self.crypto.getRandomValues === "function"
                     ) {
                         return { success: true, ty: 1 };
                     }
@@ -1063,7 +1063,7 @@ mod imp {
                 OsRngMethod::Browser => js! {
                     try {
                         let array = new Uint8Array(@{ len });
-                        window.crypto.getRandomValues(array);
+                        self.crypto.getRandomValues(array);
                         HEAPU8.set(array, @{ ptr });
 
                         return { success: true };

src/seq.rs

@@ -21,7 +21,6 @@
 #[cfg(feature="std")] use std::collections::HashMap;
 #[cfg(all(feature="alloc", not(feature="std")))] use alloc::collections::BTreeMap;
 
-
 use super::Rng;
 #[cfg(feature="alloc")] use distributions::uniform::{SampleUniform, SampleBorrow};