Skip to content

Commit

Permalink
Update rand to 0.9 (#414)
Browse files Browse the repository at this point in the history
  • Loading branch information
waywardmonkeys authored Feb 6, 2025
1 parent d7bb94d commit 4dfe1f3
Show file tree
Hide file tree
Showing 5 changed files with 155 additions and 47 deletions.
2 changes: 2 additions & 0 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[target.wasm32-unknown-unknown]
rustflags = ['--cfg', 'getrandom_backend="wasm_js"']
166 changes: 136 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,9 @@ features = ["alloc", "derive"]

# This is used for research but not really needed; maybe refactor.
[dev-dependencies]
rand = "0.8.5"
rand = "0.9.0"

[target.wasm32-unknown-unknown.dev-dependencies]
# We have a transitive dependency on getrandom and it does not automatically
# support wasm32-unknown-unknown. We need to enable the js feature.
getrandom = { version = "0.2.15", features = ["js"] }
# support wasm32-unknown-unknown. We need to enable the wasm_js feature.
getrandom = { version = "0.3.1", features = ["wasm_js"] }
6 changes: 3 additions & 3 deletions examples/quad_intersect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
use arrayvec::ArrayVec;
use kurbo::{common::solve_quartic, ParamCurve, Point, QuadBez, Shape};
use rand::{thread_rng, Rng};
use rand::Rng;

fn rand_point() -> Point {
let mut rng = thread_rng();
Point::new(rng.gen_range(0.0..500.0), rng.gen_range(0.0..500.0))
let mut rng = rand::rng();
Point::new(rng.random_range(0.0..500.0), rng.random_range(0.0..500.0))
}

fn rand_quad() -> QuadBez {
Expand Down
22 changes: 11 additions & 11 deletions src/svg.rs
Original file line number Diff line number Diff line change
Expand Up @@ -640,30 +640,30 @@ mod tests {
let mut elements = vec![];
let mut position = None;

let length = rng.gen_range(0..MAX_LENGTH);
let length = rng.random_range(0..MAX_LENGTH);
for _ in 0..length {
let should_follow: bool = random();
let kind = rng.gen_range(0..3);
let should_follow: bool = rand::random_bool(0.5);
let kind = rng.random_range(0..3);

let first = position
.filter(|_| should_follow)
.unwrap_or_else(|| Point::new(rng.r#gen(), rng.r#gen()));
.unwrap_or_else(|| Point::new(rng.random(), rng.random()));

let element: PathSeg = match kind {
0 => Line::new(first, Point::new(rng.r#gen(), rng.r#gen())).into(),
0 => Line::new(first, Point::new(rng.random(), rng.random())).into(),

1 => QuadBez::new(
first,
Point::new(rng.r#gen(), rng.r#gen()),
Point::new(rng.r#gen(), rng.r#gen()),
Point::new(rng.random(), rng.random()),
Point::new(rng.random(), rng.random()),
)
.into(),

2 => CubicBez::new(
first,
Point::new(rng.r#gen(), rng.r#gen()),
Point::new(rng.r#gen(), rng.r#gen()),
Point::new(rng.r#gen(), rng.r#gen()),
Point::new(rng.random(), rng.random()),
Point::new(rng.random(), rng.random()),
Point::new(rng.random(), rng.random()),
)
.into(),

Expand All @@ -680,7 +680,7 @@ mod tests {
#[test]
fn test_serialize_deserialize() {
const N_TESTS: u32 = 100;
let mut rng = thread_rng();
let mut rng = rand::rng();

for _ in 0..N_TESTS {
let vec = gen_random_path_sequence(&mut rng);
Expand Down

0 comments on commit 4dfe1f3

Please sign in to comment.