Skip to content

Commit

Permalink
Fixes regarding OsRng move
Browse files Browse the repository at this point in the history
  • Loading branch information
dhardy committed Aug 28, 2019
1 parent d877ed5 commit a622ea3
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 6 deletions.
2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ members = [
rand_core = { path = "rand_core", version = "0.5" }
rand_pcg = { path = "rand_pcg", version = "0.2", optional = true }
# Do not depend on 'getrandom_package' directly; use the 'getrandom' feature!
# This is a dependency because: we forward wasm feature flags
# This is renamed because: we need getrandom to depend on rand_core/getrandom
getrandom_package = { version = "0.1.1", package = "getrandom", optional = true }
log = { version = "0.4", optional = true }

Expand Down
2 changes: 1 addition & 1 deletion rand_os/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [0.2.2] - 2019-09-02
## [0.2.2] - 2019-08-28
### Changed
- `OsRng` added to `rand_core`, rendering this crate deprecated (#863)

Expand Down
3 changes: 0 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,6 @@
#[cfg(all(feature="alloc", not(feature="std")))]
extern crate alloc;

#[cfg(feature = "getrandom")]
use getrandom_package as getrandom;

#[allow(unused)]
macro_rules! trace { ($($x:tt)*) => (
#[cfg(feature = "log")] {
Expand Down
7 changes: 5 additions & 2 deletions src/rngs/std.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,11 @@

use crate::{RngCore, CryptoRng, Error, SeedableRng};

#[cfg(target_os = "emscripten")] pub(crate) use rand_hc::Hc128Core as Core;
#[cfg(not(target_os = "emscripten"))] pub(crate) use rand_chacha::ChaCha20Core as Core;
#[cfg(all(any(test, feature = "std"), target_os = "emscripten"))]
pub(crate) use rand_hc::Hc128Core as Core;
#[cfg(all(any(test, feature = "std"), not(target_os = "emscripten")))]
pub(crate) use rand_chacha::ChaCha20Core as Core;

#[cfg(target_os = "emscripten")] use rand_hc::Hc128Rng as Rng;
#[cfg(not(target_os = "emscripten"))] use rand_chacha::ChaCha20Rng as Rng;

Expand Down

0 comments on commit a622ea3

Please sign in to comment.