From 44dbbbbacf1af3ed1d4c3ae4a0c3d7f6a773ca2d Mon Sep 17 00:00:00 2001 From: Kristofers Solo Date: Thu, 12 Dec 2024 20:59:01 +0200 Subject: [PATCH] refactor(rand): remove rand_chacha dependency --- Cargo.lock | 2 -- Cargo.toml | 3 +-- src/generator.rs | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0559fca..4340e83 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2300,7 +2300,6 @@ dependencies = [ "bevy", "hexx", "rand", - "rand_chacha", "serde", "thiserror 2.0.3", ] @@ -3300,7 +3299,6 @@ checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", "rand_core", - "serde", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index 87317a6..794822a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -21,7 +21,6 @@ exclude = ["/.github", "/.gitignore", "/tests", "*.png", "*.md"] bevy = { version = "0.15", optional = true } hexx = { version = "0.19" } rand = "0.8" -rand_chacha = "0.3" serde = { version = "1.0", features = ["derive"], optional = true } thiserror = "2.0" @@ -30,7 +29,7 @@ thiserror = "2.0" [features] default = [] -serde = ["dep:serde", "hexx/serde", "rand_chacha/serde"] +serde = ["dep:serde", "hexx/serde"] bevy = ["bevy_reflect"] bevy_reflect = ["dep:bevy", "hexx/bevy_reflect"] full = ["serde", "bevy"] diff --git a/src/generator.rs b/src/generator.rs index f6dc9bf..579a69b 100644 --- a/src/generator.rs +++ b/src/generator.rs @@ -1,8 +1,7 @@ #[cfg(feature = "bevy_reflect")] use bevy::prelude::*; use hexx::{EdgeDirection, Hex}; -use rand::{seq::SliceRandom, thread_rng, Rng, RngCore, SeedableRng}; -use rand_chacha::ChaCha8Rng; +use rand::{rngs::StdRng, seq::SliceRandom, thread_rng, Rng, RngCore, SeedableRng}; use std::collections::HashSet; use crate::HexMaze; @@ -29,8 +28,9 @@ pub fn generate_backtracking(maze: &mut HexMaze, start_pos: Option, seed: O let mut rng: Box = seed.map_or_else( || Box::new(thread_rng()) as Box, - |seed| Box::new(ChaCha8Rng::seed_from_u64(seed)) as Box, + |seed| Box::new(StdRng::seed_from_u64(seed)) as Box, ); + recursive_backtrack(maze, start, &mut visited, &mut rng); }