Skip to content

Commit d255fc4

Browse files
committed
Switch to using rand_core and rand_chacha directly
And run `rustfmt`.
1 parent 5ad28db commit d255fc4

File tree

3 files changed

+11
-9
lines changed

3 files changed

+11
-9
lines changed

crates/bevy_entropy/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ keywords = ["bevy", "random", "entropy"]
1717
bevy_app = { path = "../bevy_app", version = "0.8.0-dev" }
1818
bevy_utils = { path = "../bevy_utils", version = "0.8.0-dev" }
1919
# other
20-
rand = { version = "0.8", features = ["std_rng"] }
20+
rand_core = { version = "0.6.3" }
21+
rand_chacha = { version = "0.3.1" }
2122

2223
[dev-dependencies]
2324
bevy_internal = { path = "../bevy_internal", version = "0.8.0-dev" }

crates/bevy_entropy/src/lib.rs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use bevy_app::{App, Plugin};
22
use bevy_utils::tracing::{debug, trace};
3-
use rand::{rngs::StdRng, RngCore, SeedableRng};
3+
use rand_chacha::ChaCha12Rng;
4+
use rand_core::{RngCore, SeedableRng};
45

56
pub mod prelude {
67
#[doc(hidden)]
@@ -25,14 +26,14 @@ impl Plugin for EntropyPlugin {
2526
}
2627

2728
/// A resource that provides entropy.
28-
pub struct Entropy(StdRng);
29+
pub struct Entropy(ChaCha12Rng);
2930

3031
impl Default for Entropy {
3132
/// The default entropy source is non-deterministic and seeded from the operating system.
3233
/// For a deterministic source, use [`Entropy::from`].
3334
fn default() -> Self {
3435
debug!("Entropy created via the operating system");
35-
let rng = StdRng::from_entropy();
36+
let rng = ChaCha12Rng::from_entropy();
3637
Entropy(rng)
3738
}
3839
}
@@ -43,7 +44,7 @@ impl Entropy {
4344
/// If determinism is not required, use [`Entropy::default`].
4445
pub fn from(seed: [u8; 32]) -> Self {
4546
debug!("Entropy created via seed: {:?} ", seed);
46-
let rng = StdRng::from_seed(seed);
47+
let rng = ChaCha12Rng::from_seed(seed);
4748
Entropy(rng)
4849
}
4950

crates/bevy_internal/src/prelude.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#[doc(hidden)]
22
pub use crate::{
3-
app::prelude::*, asset::prelude::*, core::prelude::*, ecs::prelude::*, entropy::prelude::*, hierarchy::prelude::*,
4-
input::prelude::*, log::prelude::*, math::prelude::*, reflect::prelude::*, scene::prelude::*,
5-
time::prelude::*, transform::prelude::*, utils::prelude::*, window::prelude::*, DefaultPlugins,
6-
MinimalPlugins,
3+
app::prelude::*, asset::prelude::*, core::prelude::*, ecs::prelude::*, entropy::prelude::*,
4+
hierarchy::prelude::*, input::prelude::*, log::prelude::*, math::prelude::*,
5+
reflect::prelude::*, scene::prelude::*, time::prelude::*, transform::prelude::*,
6+
utils::prelude::*, window::prelude::*, DefaultPlugins, MinimalPlugins,
77
};
88

99
pub use bevy_derive::{bevy_main, Deref, DerefMut};

0 commit comments

Comments
 (0)