update code to work with rand=0.9 and rand_distr=0.5 crates

andrei-ng · andrei-ng · commit 0ee49ae2ad5d · 2025-01-29T19:34:21.000+01:00
Signed-off-by: Andrei Gherghescu &lt;8067229+andrei-ng@users.noreply.github.com&gt;
diff --git a/docs/book/src/fundamentals/shapes.md b/docs/book/src/fundamentals/shapes.md
@@ -12,7 +12,7 @@ use plotly::layout::{
     ShapeType,
 };
 use plotly::{Bar, color::NamedColor, Plot, Scatter};
-use rand::thread_rng;
+use rand::rng;
 use rand_distr::{Distribution, Normal};
 ```
 
diff --git a/examples/3d_charts/Cargo.toml b/examples/3d_charts/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2021"
 
 [dependencies]
 ndarray = "0.16"
-rand = "0.8"
+rand = "0.9"
 plotly = { path = "../../plotly" }
diff --git a/examples/3d_charts/src/main.rs b/examples/3d_charts/src/main.rs
@@ -7,6 +7,7 @@ use plotly::{
     layout::{Axis, Camera, Layout, LayoutScene, Legend, Margin, ProjectionType},
     Mesh3D, Plot, Scatter3D, Surface,
 };
+
 use rand::Rng;
 
 // 3D Scatter Plots
@@ -218,8 +219,8 @@ fn colorscale_plot(show: bool) -> Plot {
     let _color: Vec<usize> = (0..z.len()).collect();
     let _color: Vec<u8> = (0..z.len()).map(|x| x as u8).collect();
     let _color: Vec<i16> = {
-        let mut rng = rand::thread_rng();
-        (0..z.len()).map(|_| rng.gen_range(0..100)).collect()
+        let mut rng = rand::rng();
+        (0..z.len()).map(|_| rng.random_range(0..100)).collect()
     };
 
     let color_max = color.iter().fold(f64::MIN, |acc, x| acc.max(*x as f64));
diff --git a/examples/basic_charts/Cargo.toml b/examples/basic_charts/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 [dependencies]
 ndarray = "0.16"
 plotly = { path = "../../plotly" }
-rand = "0.8"
-rand_distr = "0.4"
+rand = "0.9"
+rand_distr = "0.5"
diff --git a/examples/basic_charts/src/main.rs b/examples/basic_charts/src/main.rs
@@ -38,7 +38,7 @@ fn simple_scatter_plot(show: bool) -> Plot {
 // ANCHOR: line_and_scatter_plots
 fn line_and_scatter_plots(show: bool) -> Plot {
     let n: usize = 100;
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     let random_x: Vec<f64> = Array::linspace(0., 1., n).into_raw_vec_and_offset().0;
     let random_y0: Vec<f64> = Normal::new(5., 1.)
         .unwrap()
@@ -273,8 +273,12 @@ fn colored_and_styled_scatter_plot(show: bool) -> Plot {
 // ANCHOR: large_data_sets
 fn large_data_sets(show: bool) -> Plot {
     let n: usize = 100_000;
-    let mut rng = rand::thread_rng();
-    let r: Vec<f64> = Uniform::new(0., 1.).sample_iter(&mut rng).take(n).collect();
+    let mut rng = rand::rng();
+    let r: Vec<f64> = Uniform::new(0., 1.)
+        .unwrap()
+        .sample_iter(&mut rng)
+        .take(n)
+        .collect();
     let theta: Vec<f64> = Normal::new(0., 2. * std::f64::consts::PI)
         .unwrap()
         .sample_iter(&mut rng)
diff --git a/examples/customization/Cargo.toml b/examples/customization/Cargo.toml
@@ -6,6 +6,6 @@ edition = "2021"
 
 [dependencies]
 build_html = "2.5.0"
-rand = "0.8"
+rand = "0.9"
 ndarray = "0.16"
 plotly = { path = "../../plotly" }
diff --git a/examples/customization/src/main.rs b/examples/customization/src/main.rs
@@ -121,14 +121,11 @@ fn write_html(html_data: &str) -> String {
     use std::env;
     use std::{fs::File, io::Write};
 
-    use rand::{
-        distributions::{Alphanumeric, DistString},
-        thread_rng,
-    };
+    use rand::distr::{Alphanumeric, SampleString};
 
     // Set up the temp file with a unique filename.
     let mut temp = env::temp_dir();
-    let mut plot_name = Alphanumeric.sample_string(&mut thread_rng(), 22);
+    let mut plot_name = Alphanumeric.sample_string(&mut rand::rng(), 22);
     plot_name.push_str(".html");
     plot_name = format!("plotly_{}", plot_name);
     temp.push(plot_name);
diff --git a/examples/shapes/Cargo.toml b/examples/shapes/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 [dependencies]
 ndarray = "0.16"
 plotly = { path = "../../plotly" }
-rand = "0.8"
-rand_distr = "0.4"
+rand = "0.9"
+rand_distr = "0.5"
diff --git a/examples/shapes/src/main.rs b/examples/shapes/src/main.rs
@@ -9,7 +9,6 @@ use plotly::{
     },
     Bar, Plot, Scatter,
 };
-use rand::thread_rng;
 use rand_distr::{num_traits::Float, Distribution, Normal};
 
 // ANCHOR: filled_area_chart
@@ -433,7 +432,7 @@ fn circles_positioned_relative_to_the_axes(show: bool) -> Plot {
 
 // ANCHOR: highlighting_clusters_of_scatter_points_with_circle_shapes
 fn highlighting_clusters_of_scatter_points_with_circle_shapes(show: bool) -> Plot {
-    let mut rng = thread_rng();
+    let mut rng = rand::rng();
     let x0 = Normal::new(2., 0.45)
         .unwrap()
         .sample_iter(&mut rng)
diff --git a/examples/statistical_charts/Cargo.toml b/examples/statistical_charts/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 [dependencies]
 ndarray = "0.16"
 plotly = { path = "../../plotly" }
-rand = "0.8"
-rand_distr = "0.4"
+rand = "0.9"
+rand_distr = "0.5"
diff --git a/examples/statistical_charts/src/main.rs b/examples/statistical_charts/src/main.rs
@@ -170,9 +170,9 @@ fn colored_and_styled_error_bars(show: bool) -> Plot {
 // Box Plots
 // ANCHOR: basic_box_plot
 fn basic_box_plot(show: bool) -> Plot {
-    let mut rng = rand::thread_rng();
-    let uniform1 = Uniform::new(0.0, 1.0);
-    let uniform2 = Uniform::new(1.0, 2.0);
+    let mut rng = rand::rng();
+    let uniform1 = Uniform::new(0.0, 1.0).unwrap();
+    let uniform2 = Uniform::new(1.0, 2.0).unwrap();
     let n = 50;
 
     let mut y0 = Vec::with_capacity(n);
@@ -407,8 +407,8 @@ fn grouped_horizontal_box_plot(show: bool) -> Plot {
 fn fully_styled_box_plot(show: bool) -> Plot {
     let rnd_sample = |num, mul| -> Vec<f64> {
         let mut v: Vec<f64> = Vec::with_capacity(num);
-        let mut rng = rand::thread_rng();
-        let uniform = Uniform::new(0.0, mul);
+        let mut rng = rand::rng();
+        let uniform = Uniform::new(0.0, mul).unwrap();
         for _ in 0..num {
             v.push(uniform.sample(&mut rng));
         }
@@ -478,7 +478,7 @@ fn fully_styled_box_plot(show: bool) -> Plot {
 
 // Histograms
 fn sample_normal_distribution(n: usize, mean: f64, std_dev: f64) -> Vec<f64> {
-    let mut rng = rand::thread_rng();
+    let mut rng = rand::rng();
     let dist = Normal::new(mean, std_dev).unwrap();
     let mut v = Vec::<f64>::with_capacity(n);
     for _idx in 1..n {
@@ -488,8 +488,8 @@ fn sample_normal_distribution(n: usize, mean: f64, std_dev: f64) -> Vec<f64> {
 }
 
 fn sample_uniform_distribution(n: usize, lb: f64, ub: f64) -> Vec<f64> {
-    let mut rng = rand::thread_rng();
-    let dist = Uniform::new(lb, ub);
+    let mut rng = rand::rng();
+    let dist = Uniform::new(lb, ub).unwrap();
     let mut v = Vec::<f64>::with_capacity(n);
     for _idx in 1..n {
         v.push(dist.sample(&mut rng));
diff --git a/plotly/Cargo.toml b/plotly/Cargo.toml
@@ -51,5 +51,5 @@ itertools = ">=0.10, <0.15"
 itertools-num = "0.1"
 ndarray = "0.16"
 plotly_kaleido = { path = "../plotly_kaleido", features = ["download"] }
-rand_distr = "0.4"
+rand_distr = "0.5"
 base64 = "0.22"
diff --git a/plotly/src/plot.rs b/plotly/src/plot.rs
@@ -3,8 +3,8 @@ use std::{fs::File, io::Write, path::Path};
 use dyn_clone::DynClone;
 use erased_serde::Serialize as ErasedSerialize;
 use rand::{
-    distributions::{Alphanumeric, DistString},
-    thread_rng,
+    distr::{Alphanumeric, SampleString},
+    rng,
 };
 use rinja::Template;
 use serde::Serialize;
@@ -254,7 +254,7 @@ impl Plot {
 
         // Set up the temp file with a unique filename.
         let mut temp = env::temp_dir();
-        let mut plot_name = Alphanumeric.sample_string(&mut thread_rng(), 22);
+        let mut plot_name = Alphanumeric.sample_string(&mut rng(), 22);
         plot_name.push_str(".html");
         plot_name = format!("plotly_{}", plot_name);
         temp.push(plot_name);
@@ -296,7 +296,7 @@ impl Plot {
 
         // Set up the temp file with a unique filename.
         let mut temp = env::temp_dir();
-        let mut plot_name = Alphanumeric.sample_string(&mut thread_rng(), 22);
+        let mut plot_name = Alphanumeric.sample_string(&mut rng(), 22);
         plot_name.push_str(".html");
         plot_name = format!("plotly_{}", plot_name);
         temp.push(plot_name);
@@ -354,13 +354,13 @@ impl Plot {
     pub fn to_inline_html(&self, plot_div_id: Option<&str>) -> String {
         let plot_div_id = match plot_div_id {
             Some(id) => id.to_string(),
-            None => Alphanumeric.sample_string(&mut thread_rng(), 20),
+            None => Alphanumeric.sample_string(&mut rng(), 20),
         };
         self.render_inline(&plot_div_id)
     }
 
     fn to_jupyter_notebook_html(&self) -> String {
-        let plot_div_id = Alphanumeric.sample_string(&mut thread_rng(), 20);
+        let plot_div_id = Alphanumeric.sample_string(&mut rng(), 20);
 
         let tmpl = JupyterNotebookPlotTemplate {
             plot: self,
diff --git a/plotly/src/traces/histogram.rs b/plotly/src/traces/histogram.rs
@@ -220,7 +220,7 @@ where
     ///
     /// fn ndarray_to_traces() {
     ///     let n: usize = 1_250;
-    ///     let mut rng = rand::thread_rng();
+    ///     let mut rng = rand::rng();
     ///     let t: Array<f64, Ix1> = Array::range(0., 10., 10. / n as f64);
     ///     let mut ys: Array<f64, Ix2> = Array::zeros((n, 4));
     ///     let mut count = 0.;
