Bump rand to 0.8

danwilhelm · danwilhelm · commit 06e880dabb7c · 2021-06-19T21:10:42.000-07:00
diff --git a/generative_design/color/p_1_2_3_03.rs b/generative_design/color/p_1_2_3_03.rs
@@ -107,7 +107,7 @@ fn view(app: &App, model: &Model, frame: Frame) {
         // count tiles
         let mut counter = 0;
         // row count and row height
-        let row_count = rng.gen_range(5, 30);
+        let row_count = rng.gen_range(5..30);
         let row_height = (app.window_rect().h() as i32 / row_count) as i32;
 
         // seperate each line in parts
@@ -120,13 +120,13 @@ fn view(app: &App, model: &Model, frame: Frame) {
                 // sub fragment of not?
                 if rng.gen::<f32>() < 0.075 {
                     // take care of big values
-                    let fragments = rng.gen_range(2, 20);
+                    let fragments = rng.gen_range(2..20);
                     part_count = part_count + fragments - 1;
                     for _ in 0..fragments {
-                        parts.push(rng.gen_range(0, 2));
+                        parts.push(rng.gen_range(0..2));
                     }
                 } else {
-                    parts.push(rng.gen_range(2, 20));
+                    parts.push(rng.gen_range(2..20));
                 }
             }
 
diff --git a/generative_design/color/p_1_2_3_04.rs b/generative_design/color/p_1_2_3_04.rs
@@ -107,7 +107,7 @@ fn view(app: &App, model: &Model, frame: Frame) {
         // count tiles
         let mut counter = 0;
         // row count and row height
-        let row_count = rng.gen_range(5, 30);
+        let row_count = rng.gen_range(5..30);
         let row_height = (app.window_rect().h() as i32 / row_count) as i32;
 
         // seperate each line in parts
@@ -120,13 +120,13 @@ fn view(app: &App, model: &Model, frame: Frame) {
                 // sub fragment of not?
                 if rng.gen::<f32>() < 0.075 {
                     // take care of big values
-                    let fragments = rng.gen_range(2, 20);
+                    let fragments = rng.gen_range(2..20);
                     part_count = part_count + fragments - 1;
                     for _ in 0..fragments {
-                        parts.push(rng.gen_range(0, 2));
+                        parts.push(rng.gen_range(0..2));
                     }
                 } else {
-                    parts.push(rng.gen_range(2, 20));
+                    parts.push(rng.gen_range(2..20));
                 }
             }
 
diff --git a/generative_design/oscillation_figures/m_2_5_02.rs b/generative_design/oscillation_figures/m_2_5_02.rs
@@ -181,8 +181,8 @@ fn calculate_lissajous_points(app: &App, model: &mut Model) {
             * (angle * model.mod_freq_x).cos();
         let mut y = (angle * model.freq_y * fmy).sin() * (angle * model.mod_freq_y).cos();
 
-        let rx = rng.gen_range(-model.random_offset, model.random_offset + 1.0);
-        let ry = rng.gen_range(-model.random_offset, model.random_offset + 1.0);
+        let rx = rng.gen_range(-model.random_offset..model.random_offset + 1.0);
+        let ry = rng.gen_range(-model.random_offset..model.random_offset + 1.0);
 
         x = (x * (win.w() / 2.0 - 30.0 - model.random_offset) + win.w() / 2.0) + rx;
         y = (y * (win.h() / 2.0 - 30.0 - model.random_offset) + win.h() / 2.0) + ry;
diff --git a/generative_design/random_and_noise/m_1_1_01.rs b/generative_design/random_and_noise/m_1_1_01.rs
@@ -63,7 +63,7 @@ fn view(app: &App, model: &Model, frame: Frame) {
 
     let range = win.w() as usize / 10;
     let vertices = (0..=range).map(|i| {
-        let y = rng.gen_range(win.bottom(), win.top() + 1.0) as f32;
+        let y = rng.gen_range(win.bottom()..win.top() + 1.0) as f32;
         pt2(win.left() + (i as f32 * 10.0), y as f32)
     });
     draw.polyline()
@@ -74,7 +74,7 @@ fn view(app: &App, model: &Model, frame: Frame) {
     let mut rng = StdRng::seed_from_u64(model.act_random_seed);
 
     for x in (0..win.w() as usize).step_by(10) {
-        let y = rng.gen_range(win.bottom(), win.top() + 1.0) as f32;
+        let y = rng.gen_range(win.bottom()..win.top() + 1.0) as f32;
         draw.ellipse()
             .x_y(win.left() + x as f32, y as f32)
             .w_h(3.0, 3.0)
diff --git a/generative_design/random_and_noise/m_1_2_01.rs b/generative_design/random_and_noise/m_1_2_01.rs
@@ -69,8 +69,8 @@ fn view(app: &App, model: &Model, frame: Frame) {
 
     for i in 0..model.count {
         // positions
-        let random_x = rng.gen_range(win.left(), win.right() + 1.0);
-        let random_y = rng.gen_range(win.bottom(), win.top() + 1.0);
+        let random_x = rng.gen_range(win.left()..win.right() + 1.0);
+        let random_y = rng.gen_range(win.bottom()..win.top() + 1.0);
         let circle_x = (angle * i as f32).cos() * 300.0;
         let circle_y = (angle * i as f32).sin() * 300.0;
 
diff --git a/generative_design/random_and_noise/m_1_3_02.rs b/generative_design/random_and_noise/m_1_3_02.rs
@@ -70,7 +70,7 @@ fn view(app: &App, model: &Model, frame: Frame) {
     let mut rng = SmallRng::seed_from_u64(model.act_random_seed);
 
     let image = image::ImageBuffer::from_fn(win.w() as u32, win.h() as u32, |_x, _y| {
-        let r: u8 = rng.gen_range(0, std::u8::MAX);
+        let r: u8 = rng.gen_range(0..std::u8::MAX);
         nannou::image::Rgba([r, r, r, std::u8::MAX])
     });
 
diff --git a/generative_design/shape/p_2_1_2_01.rs b/generative_design/shape/p_2_1_2_01.rs
@@ -79,8 +79,8 @@ fn view(app: &App, model: &Model, frame: Frame) {
             let mx = clamp(win.right() + app.mouse.x, 0.0, win.w());
             let my = clamp(win.top() - app.mouse.y, 0.0, win.h());
 
-            let shift_x = rng.gen_range(-mx, mx + 1.0) / 20.0;
-            let shift_y = rng.gen_range(-mx, mx + 1.0) / 20.0;
+            let shift_x = rng.gen_range(-mx..mx + 1.0) / 20.0;
+            let shift_y = rng.gen_range(-mx..mx + 1.0) / 20.0;
 
             draw.ellipse()
                 .x_y(pos_x + shift_x, pos_y + shift_y)
diff --git a/generative_design/shape/p_2_1_2_02.rs b/generative_design/shape/p_2_1_2_02.rs
@@ -95,8 +95,8 @@ fn view(app: &App, model: &Model, frame: Frame) {
             let pos_x = (win.left() + (tile_w / 2.0)) + tile_w * grid_x as f32;
             let pos_y = (win.top() - (tile_h / 2.0)) - tile_h * grid_y as f32;
 
-            let shift_x = rng.gen_range(-mx, mx + 1.0) / 20.0;
-            let shift_y = rng.gen_range(-my, my + 1.0) / 20.0;
+            let shift_x = rng.gen_range(-mx..mx + 1.0) / 20.0;
+            let shift_y = rng.gen_range(-my..my + 1.0) / 20.0;
 
             draw.ellipse()
                 .x_y(pos_x + shift_x, pos_y + shift_y)
diff --git a/generative_design/shape/p_2_1_2_04.rs b/generative_design/shape/p_2_1_2_04.rs
@@ -77,14 +77,14 @@ fn view(app: &App, model: &Model, frame: Frame) {
             let mx = clamp(win.right() + app.mouse.x, 0.0, win.w());
             let my = clamp(win.top() - app.mouse.y, 0.0, win.h());
 
-            let shift_x1 = mx / 20.0 * rng.gen_range(-1.0, 1.0);
-            let shift_y1 = my / 20.0 * rng.gen_range(-1.0, 1.0);
-            let shift_x2 = mx / 20.0 * rng.gen_range(-1.0, 1.0);
-            let shift_y2 = my / 20.0 * rng.gen_range(-1.0, 1.0);
-            let shift_x3 = mx / 20.0 * rng.gen_range(-1.0, 1.0);
-            let shift_y3 = my / 20.0 * rng.gen_range(-1.0, 1.0);
-            let shift_x4 = mx / 20.0 * rng.gen_range(-1.0, 1.0);
-            let shift_y4 = my / 20.0 * rng.gen_range(-1.0, 1.0);
+            let shift_x1 = mx / 20.0 * rng.gen_range(-1.0..1.0);
+            let shift_y1 = my / 20.0 * rng.gen_range(-1.0..1.0);
+            let shift_x2 = mx / 20.0 * rng.gen_range(-1.0..1.0);
+            let shift_y2 = my / 20.0 * rng.gen_range(-1.0..1.0);
+            let shift_x3 = mx / 20.0 * rng.gen_range(-1.0..1.0);
+            let shift_y3 = my / 20.0 * rng.gen_range(-1.0..1.0);
+            let shift_x4 = mx / 20.0 * rng.gen_range(-1.0..1.0);
+            let shift_y4 = my / 20.0 * rng.gen_range(-1.0..1.0);
             let mut points = Vec::new();
             points.push(pt2(pos_x + shift_x1, pos_y + shift_y1));
             points.push(pt2(pos_x + model.rect_size + shift_x2, pos_y + shift_y2));
diff --git a/generative_design/shape/p_2_1_3_01.rs b/generative_design/shape/p_2_1_3_01.rs
@@ -90,7 +90,7 @@ fn view(app: &App, model: &Model, frame: Frame) {
             //println!("x {} || y {}", win.left() + model.tile_width * grid_x as f32, win.top() - model.tile_height * grid_y as f32);
             let scale = model.tile_width / model.tile_height;
             draw = draw.scale(scale);
-            let toggle = rng.gen_range(0, 4);
+            let toggle = rng.gen_range(0..4);
             let rotation = match toggle {
                 0 => -(PI / 2.0),
                 1 => 0.0,
diff --git a/generative_design/shape/p_2_1_3_05.rs b/generative_design/shape/p_2_1_3_05.rs
@@ -85,7 +85,7 @@ fn view(app: &App, model: &Model, frame: Frame) {
             let pos_y = (win.top() - (tile_height / 2.0)) - tile_height * grid_y as f32;
 
             //modules
-            let heading = rng.gen_range(0, 4);
+            let heading = rng.gen_range(0..4);
 
             for i in 0..step_size as usize {
                 let radius = map_range(i, 0, step_size as usize, tile_width, end_size) / 2.0;
diff --git a/generative_design/type/p_3_1_3_03.rs b/generative_design/type/p_3_1_3_03.rs
@@ -123,7 +123,7 @@ fn view(app: &App, model: &Model, frame: Frame) {
             1.0,
         );
         let line_length = char_size;
-        let line_angle = rng.gen_range(-PI, PI) * mx * (PI / 2.0);
+        let line_angle = rng.gen_range(-PI..PI) * mx * (PI / 2.0);
         let new_pos_x = line_length * line_angle.cos();
         let new_pos_y = line_length * line_angle.sin();
 
diff --git a/nannou_core/Cargo.toml b/nannou_core/Cargo.toml
@@ -12,15 +12,15 @@ num-traits = { version = "0.2.14", default-features = false }
 palette = { version = "0.5", default-features = false, features = ["named"] }
 # TODO: Need to check support for no-std.
 # pennereq = "0.3"
-rand = { version = "0.7", default-features = false, features = ["small_rng"] }
+rand = { version = "0.8", default-features = false, features = ["small_rng"] }
 # TODO: Needs no-std support before we can add text logic to this core.
 # rusttype = "0.8"
 
 [features]
 default = ["std"]
 libm = ["glam/libm", "num-traits/libm", "palette/libm" ]
 serde = ["glam/serde", "palette/serializing"]
-std = ["glam/std", "num-traits/std", "palette/std", "rand/std"]
+std = ["glam/std", "num-traits/std", "palette/std", "rand/std", "rand/std_rng"]
 
 [package.metadata.docs.rs]
 features = ["serde", "std"]
diff --git a/nannou_core/src/rand.rs b/nannou_core/src/rand.rs
@@ -16,7 +16,7 @@ pub use rand;
 /// the "std" feature enabled.
 #[cfg(feature = "std")]
 pub fn random_f32() -> f32 {
-    random()
+    rand::random()
 }
 
 /// A wrapper function around the `random` function that avoids the need for specifying a type in
@@ -27,7 +27,7 @@ pub fn random_f32() -> f32 {
 /// the "std" feature enabled.
 #[cfg(feature = "std")]
 pub fn random_f64() -> f64 {
-    random()
+    rand::random()
 }
 
 /// A function for generating a random value within the given range.
@@ -38,7 +38,7 @@ pub fn random_f64() -> f64 {
 /// If the given `min` is greater than the given `max`, they will be swapped before calling
 /// `gen_range` internally to avoid triggering a `panic!`.
 ///
-/// This calls `rand::thread_rng().gen_range(min, max)` internally, in turn using the thread-local
+/// This calls `rand::thread_rng().gen_range(min..max)` internally, in turn using the thread-local
 /// default random number generator.
 ///
 /// NOTE: This helper function relies on a thread-local RNG and is currently only available with
@@ -49,7 +49,7 @@ where
     T: PartialOrd + distributions::uniform::SampleUniform,
 {
     let (min, max) = if min <= max { (min, max) } else { (max, min) };
-    rand::thread_rng().gen_range(min, max)
+    rand::thread_rng().gen_range(min..max)
 }
 
 /// Generates and returns a random ascii character.
@@ -68,6 +68,6 @@ pub fn random_ascii() -> char {
                             abcdefghijklmnopqrstuvwxyz\
                             0123456789)(*&^%$#@!~. ";
 
-    let idx = rand::thread_rng().gen_range(0, ASCIISET.len());
+    let idx = rand::thread_rng().gen_range(0..ASCIISET.len());
     ASCIISET[idx] as char
 }
diff --git a/nannou_new/Cargo.toml b/nannou_new/Cargo.toml
@@ -13,4 +13,4 @@ edition = "2018"
 [dependencies]
 cargo = "0.42" # For retrieving the latest `nannou` version and working with cargo-clone.
 names = "0.11" # For generating random project names.
-rand = "0.7" # For generating random beverages (very important).
+rand = "0.8" # For generating random beverages (very important).
diff --git a/nature_of_code/Cargo.toml b/nature_of_code/Cargo.toml
@@ -211,17 +211,17 @@ path = "chp_04_systems/4_10_exercise_particle_repel.rs"
 [[example]]
 name = "6_01_seek"
 path = "chp_06_agents/6_01_seek.rs"
-[[example]] 
-name = "6_01_seek_trail" 
+[[example]]
+name = "6_01_seek_trail"
 path = "chp_06_agents/6_01_seek_trail.rs"
-[[example]] 
-name = "6_02_arrive" 
+[[example]]
+name = "6_02_arrive"
 path = "chp_06_agents/6_02_arrive.rs"
-[[example]] 
-name = "6_03_stay_within_walls" 
+[[example]]
+name = "6_03_stay_within_walls"
 path = "chp_06_agents/6_03_stay_within_walls.rs"
-[[example]] 
-name = "6_03_stay_within_walls_trail" 
+[[example]]
+name = "6_03_stay_within_walls_trail"
 path = "chp_06_agents/6_03_stay_within_walls_trail.rs"
 
 # Chapter 7 Cellular Automata
@@ -248,34 +248,34 @@ name = "7_hexagon_cells"
 path = "chp_07_cellular_automata/7_hexagon_cells.rs"
 
 # Chapter 8 Fractals
-[[example]] 
-name = "8_1_recursion" 
+[[example]]
+name = "8_1_recursion"
 path = "chp_08_fractals/8_1_recursion.rs"
-[[example]] 
-name = "8_2_recursion" 
+[[example]]
+name = "8_2_recursion"
 path = "chp_08_fractals/8_2_recursion.rs"
-[[example]] 
-name = "8_3_recursion" 
+[[example]]
+name = "8_3_recursion"
 path = "chp_08_fractals/8_3_recursion.rs"
-[[example]] 
-name = "8_4_cantor_set" 
+[[example]]
+name = "8_4_cantor_set"
 path = "chp_08_fractals/8_4_cantor_set.rs"
-[[example]] 
-name = "8_4_tree" 
+[[example]]
+name = "8_4_tree"
 path = "chp_08_fractals/8_4_tree.rs"
 
 # Chapter 9 Genetic Algorithms
-[[example]] 
-name = "9_1_ga_shakespeare" 
+[[example]]
+name = "9_1_ga_shakespeare"
 path = "chp_09_genetic_algorithms/9_1_ga_shakespeare.rs"
 
 # Chapter 10 Neural Networks
-[[example]] 
-name = "10_01_simple_perceptron" 
+[[example]]
+name = "10_01_simple_perceptron"
 path = "chp_10_neural_networks/10_01_simple_perceptron.rs"
-[[example]] 
-name = "10_02_seeking_neural" 
+[[example]]
+name = "10_02_seeking_neural"
 path = "chp_10_neural_networks/10_02_seeking_neural.rs"
-[[example]] 
-name = "10_03_network_viz" 
+[[example]]
+name = "10_03_network_viz"
 path = "chp_10_neural_networks/10_03_network_viz.rs"
