flux: update rand code

.cargo/config.toml

@@ -0,0 +1,2 @@
+[target.'wasm32-unknown-unknown']
+rustflags = [ "--cfg", "getrandom_backend=\"wasm_js\"" ]

Cargo.toml

@@ -37,7 +37,7 @@ glam = "0.29.2"
 half = { version = "2", features = ["bytemuck"] }
 log = "0.4"
 pollster = "0.4"
-rand = "0.9"
+rand = { version = "0.9", features = ["thread_rng"] }
 rand_pcg = "0.9"
 rand_seeder = "0.4"
 raw-window-handle = "0.6"

flake-module.nix

@@ -45,6 +45,7 @@
       fileSetForCrate = crate: lib.fileset.toSource {
         root = ./.;
         fileset = lib.fileset.unions [
+          ./.cargo
           ./Cargo.toml
           ./Cargo.lock
           ./flux

flux-gl/flux/src/rng.rs

@@ -4,7 +4,7 @@
 // We want to have the option of seeding our RNGs to generate determentistic
 // output for testing.
 
-use rand::distributions::{Alphanumeric, Standard};
+use rand::distr::{Alphanumeric, StandardUniform};
 use rand::prelude::*;
 use rand_pcg::Pcg32;
 use rand_seeder::Seeder;
@@ -13,26 +13,26 @@ use std::thread_local;
 
 thread_local!(
     static FLUX_RNG: RefCell<Pcg32> = {
-        let rng = Pcg32::from_rng(thread_rng()).expect("Cannot initialize random number generator");
+        let rng = Pcg32::from_rng(&mut rand::rng());
         RefCell::new(rng)
     }
 );
 
 pub fn init_from_seed(optional_seed: &Option<String>) {
     let seed = optional_seed.as_ref().cloned().unwrap_or_else(|| {
-        thread_rng()
+        rand::rng()
             .sample_iter(&Alphanumeric)
             .take(32)
             .map(char::from)
             .collect()
     });
 
-    FLUX_RNG.with(|rng| rng.replace(Seeder::from(seed).make_rng()));
+    FLUX_RNG.with(|rng| rng.replace(Seeder::from(seed).into_rng()));
 }
 
 pub fn gen<T>() -> T
 where
-    Standard: Distribution<T>,
+    StandardUniform: Distribution<T>,
 {
-    FLUX_RNG.with(|rng| rng.borrow_mut().gen::<T>())
+    FLUX_RNG.with(|rng| rng.borrow_mut().random::<T>())
 }

flux/src/rng.rs

@@ -4,7 +4,7 @@
 // We want to have the option of seeding our RNGs to generate determentistic
 // output for testing.
 
-use rand::distributions::{Alphanumeric, Standard};
+use rand::distr::{Alphanumeric, StandardUniform};
 use rand::prelude::*;
 use rand_pcg::Pcg32;
 use rand_seeder::Seeder;
@@ -13,26 +13,26 @@ use std::thread_local;
 
 thread_local!(
     static FLUX_RNG: RefCell<Pcg32> = {
-        let rng = Pcg32::from_rng(thread_rng()).expect("Cannot initialize random number generator");
+        let rng = Pcg32::from_rng(&mut rand::rng());
         RefCell::new(rng)
     }
 );
 
 pub fn init_from_seed(optional_seed: &Option<String>) {
     let seed = optional_seed.as_ref().cloned().unwrap_or_else(|| {
-        thread_rng()
+        rand::rng()
             .sample_iter(&Alphanumeric)
             .take(32)
             .map(char::from)
             .collect()
     });
 
-    FLUX_RNG.with(|rng| rng.replace(Seeder::from(seed).make_rng()));
+    FLUX_RNG.with(|rng| rng.replace(Seeder::from(seed).into_rng()));
 }
 
 pub fn gen<T>() -> T
 where
-    Standard: Distribution<T>,
+    StandardUniform: Distribution<T>,
 {
-    FLUX_RNG.with(|rng| rng.borrow_mut().gen::<T>())
+    FLUX_RNG.with(|rng| rng.borrow_mut().random::<T>())
 }