Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -733,8 +733,8 @@ tracing = { version = "0.1", default-features = false, optional = true }
bevy_dylib = { path = "crates/bevy_dylib", version = "0.19.0-dev", default-features = false, optional = true }

[dev-dependencies]
rand = "0.9.0"
rand_chacha = "0.9.0"
rand = "0.10.0"
chacha20 = { version = "0.10.0", default-features = false, features = ["rng"] }
ron = "0.12"
flate2 = "1.0"
serde = { version = "1", features = ["derive"] }
Expand Down Expand Up @@ -765,7 +765,7 @@ gltf = "1.4"
ureq = { version = "3.0.8", features = ["json"] }

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
getrandom = { version = "0.3", default-features = false, features = [
getrandom = { version = "0.4", default-features = false, features = [
"wasm_js",
] }
wasm-bindgen = { version = "0.2" }
Expand Down
6 changes: 3 additions & 3 deletions benches/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@ bevy_platform = { path = "../crates/bevy_platform", default-features = false, fe
] }

# Other crates
glam = { version = "0.31.0", default-features = false, features = [
glam = { version = "0.32.0", default-features = false, features = [
"std",
"rand",
] }
rand = "0.9"
rand_chacha = "0.9"
rand = "0.10"
chacha20 = { version = "0.10.0", default-features = false, features = ["rng"] }
nonmax = { version = "0.5", default-features = false }

[lints.clippy]
Expand Down
2 changes: 1 addition & 1 deletion benches/benches/bevy_ecs/change_detection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ use bevy_ecs::{
query::QueryFilter,
world::World,
};
use chacha20::ChaCha8Rng;
use criterion::{criterion_group, Criterion};
use rand::{prelude::SliceRandom, SeedableRng};
use rand_chacha::ChaCha8Rng;

criterion_group!(
benches,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use bevy_ecs::prelude::*;
use chacha20::ChaCha8Rng;
use rand::{prelude::SliceRandom, SeedableRng};
use rand_chacha::ChaCha8Rng;

#[derive(Component, Copy, Clone)]
struct TableData(f32);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use bevy_ecs::prelude::*;
use bevy_tasks::{ComputeTaskPool, TaskPool};
use chacha20::ChaCha8Rng;
use rand::{prelude::SliceRandom, SeedableRng};
use rand_chacha::ChaCha8Rng;

#[derive(Component, Copy, Clone)]
struct TableData(f32);
Expand Down
2 changes: 1 addition & 1 deletion benches/benches/bevy_ecs/observers/custom.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ use bevy_ecs::{
world::World,
};

use chacha20::ChaCha8Rng;
use criterion::Criterion;
use rand::{prelude::SliceRandom, SeedableRng};
use rand_chacha::ChaCha8Rng;
fn deterministic_rand() -> ChaCha8Rng {
ChaCha8Rng::seed_from_u64(42)
}
Expand Down
2 changes: 1 addition & 1 deletion benches/benches/bevy_ecs/observers/lifecycle.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use bevy_ecs::{component::Component, lifecycle::Insert, observer::On, world::World};
use chacha20::ChaCha8Rng;
use core::hint::black_box;
use criterion::Criterion;
use rand::SeedableRng;
use rand_chacha::ChaCha8Rng;

fn deterministic_rand() -> ChaCha8Rng {
ChaCha8Rng::seed_from_u64(42)
Expand Down
4 changes: 2 additions & 2 deletions benches/benches/bevy_ecs/observers/propagation.rs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
use core::hint::black_box;

use bevy_ecs::prelude::*;
use chacha20::ChaCha8Rng;
use criterion::Criterion;
use rand::SeedableRng;
use rand::{seq::IteratorRandom, Rng};
use rand_chacha::ChaCha8Rng;
use rand::{seq::IteratorRandom, RngExt};

const DENSITY: usize = 20; // percent of nodes with listeners
const ENTITY_DEPTH: usize = 64;
Expand Down
6 changes: 3 additions & 3 deletions benches/benches/bevy_ecs/world/entity_hash.rs
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
use bevy_ecs::entity::{Entity, EntityGeneration, EntityHashSet};
use chacha20::ChaCha8Rng;
use criterion::{BenchmarkId, Criterion, Throughput};
use rand::{Rng, SeedableRng};
use rand_chacha::ChaCha8Rng;
use rand::{RngExt, SeedableRng};

const SIZES: [usize; 5] = [100, 316, 1000, 3162, 10000];

fn make_entity(rng: &mut impl Rng, size: usize) -> Entity {
fn make_entity(rng: &mut impl RngExt, size: usize) -> Entity {
// -log₂(1-x) gives an exponential distribution with median 1.0
// That lets us get values that are mostly small, but some are quite large
// * For ids, half are in [0, size), half are unboundedly larger.
Expand Down
2 changes: 1 addition & 1 deletion benches/benches/bevy_ecs/world/world_get.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ use bevy_ecs::{
system::{Query, SystemState},
world::{EntityMut, World},
};
use chacha20::ChaCha8Rng;
use criterion::Criterion;
use rand::{prelude::SliceRandom, SeedableRng};
use rand_chacha::ChaCha8Rng;
use seq_macro::seq;

#[derive(Component, Default)]
Expand Down
2 changes: 1 addition & 1 deletion benches/benches/bevy_math/bounding.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use criterion::{criterion_group, Criterion};
use rand::{
distr::{Distribution, StandardUniform, Uniform},
rngs::StdRng,
Rng, SeedableRng,
RngExt, SeedableRng,
};

criterion_group!(benches, bounding);
Expand Down
4 changes: 2 additions & 2 deletions benches/benches/bevy_reflect/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use core::{fmt::Write, hint::black_box, str, time::Duration};

use benches::bench;
use bevy_reflect::ParsedPath;
use chacha20::ChaCha8Rng;
use criterion::{criterion_group, BatchSize, BenchmarkId, Criterion, Throughput};
use rand::{distr::Uniform, Rng, SeedableRng};
use rand_chacha::ChaCha8Rng;
use rand::{distr::Uniform, RngExt, SeedableRng};

criterion_group!(benches, parse_reflect_path);

Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_animation/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ thiserror = { version = "2", default-features = false }
derive_more = { version = "2", default-features = false, features = ["from"] }
either = "1.13"
thread_local = "1"
uuid = { version = "1.13.1", features = ["v4"] }
uuid = { version = "1.21.0", features = ["v4"] }
smallvec = { version = "1", default-features = false }
tracing = { version = "0.1", default-features = false, features = ["std"] }

[target.'cfg(target_arch = "wasm32")'.dependencies]
# TODO: Assuming all wasm builds are for the browser. Require `no_std` support to break assumption.
uuid = { version = "1.13.1", default-features = false, features = ["js"] }
uuid = { version = "1.21.0", default-features = false, features = ["js"] }

[lints]
workspace = true
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_anti_alias/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ bevy_post_process = { path = "../bevy_post_process", version = "0.19.0-dev" }
# other
tracing = { version = "0.1", default-features = false, features = ["std"] }
dlss_wgpu = { version = "4.0.0-dev", optional = true }
uuid = { version = "1", optional = true }
uuid = { version = "1.21.0", optional = true }

[lints]
workspace = true
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_asset/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ ron = { version = "0.12", default-features = false }
serde = { version = "1", default-features = false, features = ["derive"] }
thiserror = { version = "2", default-features = false }
derive_more = { version = "2", default-features = false, features = ["from"] }
uuid = { version = "1.13.1", default-features = false, features = [
uuid = { version = "1.21.0", default-features = false, features = [
"v4",
"serde",
] }
Expand All @@ -85,7 +85,7 @@ web-sys = { version = "0.3", features = [
] }
wasm-bindgen-futures = "0.4"
js-sys = "0.3"
uuid = { version = "1.13.1", default-features = false, features = ["js"] }
uuid = { version = "1.21.0", default-features = false, features = ["js"] }
bevy_app = { path = "../bevy_app", version = "0.19.0-dev", default-features = false, features = [
"web",
] }
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_ecs/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ concurrent-queue = { version = "2.5.0", default-features = false, features = [
] }

[dev-dependencies]
rand = "0.9"
rand = "0.10"
static_assertions = "1.1.0"
serde_test = "1.0"

Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_ecs/examples/change_detection.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
)]

use bevy_ecs::prelude::*;
use rand::Rng;
use rand::RngExt;
use std::ops::Deref;

fn main() {
Expand Down
2 changes: 1 addition & 1 deletion crates/bevy_ecs/examples/resources.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
)]

use bevy_ecs::prelude::*;
use rand::Rng;
use rand::RngExt;
use std::ops::Deref;

fn main() {
Expand Down
12 changes: 6 additions & 6 deletions crates/bevy_math/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ keywords = ["bevy"]
rust-version = "1.85.0"

[dependencies]
glam = { version = "0.31.0", default-features = false, features = ["bytemuck"] }
glam = { version = "0.32.0", default-features = false, features = ["bytemuck"] }
thiserror = { version = "2", default-features = false }
derive_more = { version = "2", default-features = false, features = [
"from",
Expand All @@ -22,8 +22,8 @@ serde = { version = "1", default-features = false, features = [
], optional = true }
libm = { version = "0.2", optional = true }
approx = { version = "0.5", default-features = false, optional = true }
rand = { version = "0.9", default-features = false, optional = true }
rand_distr = { version = "0.5", optional = true }
rand = { version = "0.10", default-features = false, optional = true }
rand_distr = { version = "0.6", optional = true }
arrayvec = { version = "0.7", default-features = false }
bevy_reflect = { path = "../bevy_reflect", version = "0.19.0-dev", default-features = false, features = [
"glam",
Expand All @@ -33,11 +33,11 @@ variadics_please = "1.1"
[dev-dependencies]
approx = "0.5"
# Supply rngs for examples and tests
rand = "0.9"
rand_chacha = "0.9"
rand = "0.10"
chacha20 = { version = "0.10.0", default-features = false, features = ["rng"] }
# Enable the approx feature when testing.
bevy_math = { path = ".", default-features = false, features = ["approx"] }
glam = { version = "0.31.0", default-features = false, features = ["approx"] }
glam = { version = "0.32.0", default-features = false, features = ["approx"] }

[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
getrandom = { version = "0.3", default-features = false, features = [
Expand Down
4 changes: 2 additions & 2 deletions crates/bevy_math/src/sampling/mesh_sampling.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use crate::{
ShapeSample, Vec3,
};
use alloc::vec::Vec;
use rand::Rng;
use rand::RngExt;
use rand_distr::{
weighted::{Error as WeightedError, WeightedAliasIndex},
Distribution,
Expand Down Expand Up @@ -35,7 +35,7 @@ pub struct UniformMeshSampler {
}

impl Distribution<Vec3> for UniformMeshSampler {
fn sample<R: Rng + ?Sized>(&self, rng: &mut R) -> Vec3 {
fn sample<R: RngExt + ?Sized>(&self, rng: &mut R) -> Vec3 {
let face_index = self.face_distribution.sample(rng);
self.triangles[face_index].sample_interior(rng)
}
Expand Down
Loading