Update rand

Author: gridbugs

caw/Cargo.toml

@@ -40,7 +40,7 @@ caw_midi_udp_widgets_app_lib = { version = "0.1", path = "../midi-udp-widgets-ap
 
 [dev-dependencies]
 anyhow = "1.0"
-rand = "0.8"
+rand = "0.9"
 env_logger = "0.11"
 clap = { version = "4", features = ["derive"] }
 

interactive/Cargo.toml

@@ -30,7 +30,7 @@ caw_utils = { version = "0.4", path = "../utils" }
 caw_audio_file = { version = "0.4", path = "../audio-file" }
 caw_widgets = { path = "../widgets" }
 env_logger = "0.11"
-rand = "0.8"
+rand = "0.9"
 wide = "0.7"
 clap = { version = "4", features = ["derive"] }
 

interactive/examples/harmonics_oscillographics.rs

@@ -1,26 +1,26 @@
 use caw_core::*;
 use caw_interactive::{
-    window::{Visualization, Window},
     Input,
+    window::{Visualization, Window},
 };
 use caw_modules::*;
 use rand::Rng;
 use rgb_int::Rgb24;
 use std::{
     sync::{
-        mpsc::{self, Receiver, Sender},
         Arc, RwLock,
+        mpsc::{self, Receiver, Sender},
     },
     thread,
 };
 
 fn signal() -> Sig<impl SigT<Item = f32>> {
     let base_freq_hz = 50.0;
-    let mut rng = rand::thread_rng();
-    let freq_hz =
-        (rng.gen_range(1..=3) as f32 * base_freq_hz) + (rng.gen::<f32>() * 0.1);
-    let lfo =
-        oscillator(Saw, rng.gen::<f32>() * 0.1).build() * rng.gen::<f32>();
+    let mut rng = rand::rng();
+    let freq_hz = (rng.random_range(1..=3) as f32 * base_freq_hz)
+        + (rng.random::<f32>() * 0.1);
+    let lfo = oscillator(Saw, rng.random::<f32>() * 0.1).build()
+        * rng.random::<f32>();
     oscillator(Saw, freq_hz + lfo).build() * 0.2
 }
 
@@ -62,7 +62,7 @@ struct MultithreadedSignal {
 }
 
 impl MultithreadedSignal {
-    fn new(num_threads: usize, input: Input) -> Sig<impl SigT<Item = f32>> {
+    fn new_sig(num_threads: usize, input: Input) -> Sig<impl SigT<Item = f32>> {
         let mut thread_info = Vec::new();
         for _ in 0..num_threads {
             let (send_query, recv_query) = mpsc::channel();
@@ -132,7 +132,7 @@ fn main() -> anyhow::Result<()> {
     let thresh = 10.0;
     let input = window.input();
     let sig = Stereo::new_fn(|| {
-        MultithreadedSignal::new(6, input.clone())
+        MultithreadedSignal::new_sig(6, input.clone())
             .map(|x| x.clamp(-thresh, thresh))
     });
     window.play_stereo(sig, Default::default())

interactive/examples/many_oscillators_multithreaded_visualized.rs

@@ -4,8 +4,8 @@ use rand::Rng;
 use rgb_int::Rgb24;
 use std::{
     sync::{
-        mpsc::{self, Receiver, Sender},
         Arc, RwLock,
+        mpsc::{self, Receiver, Sender},
     },
     thread,
 };
@@ -34,11 +34,11 @@ impl SigT for SawOscillatorWide {
 
 fn osc_wide(freq: f32x8) -> Sig<impl SigT<Item = f32>> {
     let num_steps = 3.0;
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     Sig(SawOscillatorWide {
         freq,
         state_01: f32x8::splat(
-            (rng.gen::<f32>() * num_steps).floor() / num_steps,
+            (rng.random::<f32>() * num_steps).floor() / num_steps,
         ) * 0.1,
         buf: Vec::new(),
     })

interactive/src/input.rs

@@ -1,5 +1,5 @@
 pub use caw_computer_keyboard::{Key, Keyboard as KeyboardGeneric};
-use caw_core::{sig_var, Sig, SigT, SigVar};
+use caw_core::{Sig, SigT, SigVar, sig_var};
 use sdl2::{keyboard::Scancode, mouse::MouseButton as SdlMouseButton};
 
 #[derive(Debug, Clone, Copy)]
@@ -146,7 +146,7 @@ impl Input {
         self.mouse.clone()
     }
 
-    pub fn key(&self, key: Key) -> Sig<impl SigT<Item = bool>> {
+    pub fn key(&self, key: Key) -> Sig<impl SigT<Item = bool> + use<>> {
         self.keyboard.get(key)
     }
 
@@ -157,11 +157,11 @@ impl Input {
         self.mouse.button(mouse_button)
     }
 
-    pub fn x_01(&self) -> Sig<impl SigT<Item = f32>> {
+    pub fn x_01(&self) -> Sig<impl SigT<Item = f32> + use<>> {
         self.mouse.x_01()
     }
 
-    pub fn y_01(&self) -> Sig<impl SigT<Item = f32>> {
+    pub fn y_01(&self) -> Sig<impl SigT<Item = f32> + use<>> {
         self.mouse.y_01()
     }
 }

keyboard/Cargo.toml

@@ -10,12 +10,12 @@ documentation = "https://docs.rs/caw_keyboard"
 edition = "2024"
 
 [features]
-web = ["getrandom/js"]
+web = ["getrandom/wasm_js"]
 
 [dependencies]
 caw_core = { version = "0.5", path = "../core" }
 smallvec = ">=1.6.1,<2"
 log = "0.4"
-rand = "0.8"
-getrandom = "0.2"
+rand = "0.9"
+getrandom = "0.3"
 itertools = "0.14"

keyboard/src/event.rs

@@ -1,11 +1,12 @@
 use crate::{
+    MonoVoice, Note,
     chord::{Chord, Inversion},
-    polyphony, MonoVoice, Note,
+    polyphony,
 };
 use caw_core::{Buf, ConstBuf, Sig, SigCtx, SigT};
 use itertools::izip;
-use rand::{rngs::StdRng, Rng, SeedableRng};
-use smallvec::{smallvec, SmallVec};
+use rand::{Rng, SeedableRng, rngs::StdRng};
+use smallvec::{SmallVec, smallvec};
 use std::{cmp::Ordering, collections::HashSet};
 
 /// A key being pressed or released
@@ -392,7 +393,7 @@ impl ArpState {
             index: 0,
             current_note: None,
             ascending: true,
-            rng: StdRng::from_entropy(),
+            rng: StdRng::from_os_rng(),
         }
     }
 
@@ -465,7 +466,8 @@ impl ArpState {
                     }
                 }
                 Random => {
-                    let index = self.rng.gen_range(0..self.store.entries.len());
+                    let index =
+                        self.rng.random_range(0..self.store.entries.len());
                     self.store.entries[index].note
                 }
                 Indices(indices) => {

modules/Cargo.toml

@@ -10,13 +10,13 @@ documentation = "https://docs.rs/caw_modules"
 edition = "2024"
 
 [features]
-web = ["getrandom/js"]
+web = ["getrandom/wasm_js"]
 
 [dependencies]
 caw_core = { version = "0.5", path = "../core" }
 caw_builder_proc_macros = { version = "0.1", path = "../builder-proc-macros" }
 itertools = "0.14"
 wide = "0.7"
-rand = "0.8"
+rand = "0.9"
 log = "0.4"
-getrandom = "0.2"
+getrandom = "0.3"

modules/src/super_saw.rs

@@ -1,7 +1,7 @@
 use caw_builder_proc_macros::builder;
 use caw_core::{Buf, Sig, SigCtx, SigT};
 use itertools::izip;
-use rand::{rngs::StdRng, Rng, SeedableRng};
+use rand::{Rng, SeedableRng, rngs::StdRng};
 use wide::f32x8;
 
 #[derive(Debug, Clone, Copy)]
@@ -119,16 +119,16 @@ where
                 }
             }
             SuperSawInit::Random => {
-                let mut rng = StdRng::from_entropy();
+                let mut rng = StdRng::from_os_rng();
                 for (x, mask) in state_01.iter_mut().zip(mask.iter()) {
-                    *x = rng.gen::<[f32; 8]>().into();
+                    *x = rng.random::<[f32; 8]>().into();
                     *x *= mask;
                 }
             }
             SuperSawInit::RandomWithSeed(seed) => {
                 let mut rng = StdRng::seed_from_u64(seed);
                 for (x, mask) in state_01.iter_mut().zip(mask.iter()) {
-                    *x = rng.gen::<[f32; 8]>().into();
+                    *x = rng.random::<[f32; 8]>().into();
                     *x *= mask;
                 }
             }

player/Cargo.toml

@@ -21,7 +21,7 @@ log = "0.4"
 [dev-dependencies]
 caw_modules = { version = "0.4", path = "../modules" }
 env_logger = "0.11"
-rand = "0.8"
+rand = "0.9"
 
 [[example]]
 name = "saw"