updted dependency API usage

Author: Ioannis Giagkiozis

plotly/examples/basic_charts.rs

@@ -23,21 +23,21 @@ fn simple_scatter_plot(show: bool) {
 
 fn line_and_scatter_plots(show: bool) {
     let n: usize = 100;
-    let rng = rand::thread_rng();
+    let mut rng = rand::thread_rng();
     let random_x: Vec<f64> = linspace(0., 1., n).collect();
     let random_y0: Vec<f64> = Normal::new(5., 1.)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(n)
         .collect();
     let random_y1: Vec<f64> = Normal::new(0., 1.)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(n)
         .collect();
     let random_y2: Vec<f64> = Normal::new(-5., 1.)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(n)
         .collect();
 
@@ -224,16 +224,16 @@ fn colored_and_styled_scatter_plot(show: bool) {
 
 fn large_data_sets(show: bool) {
     let n: usize = 100_000;
-    let rng = rand::thread_rng();
-    let r: Vec<f64> = Uniform::new(0., 1.).sample_iter(rng).take(n).collect();
+    let mut rng = rand::thread_rng();
+    let r: Vec<f64> = Uniform::new(0., 1.).sample_iter(&mut rng).take(n).collect();
     let theta: Vec<f64> = Normal::new(0., 2. * std::f64::consts::PI)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(n)
         .collect();
     let colors: Vec<f64> = Normal::new(0., 1.)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(n)
         .collect();
 

plotly/examples/fundamentals.rs

@@ -419,35 +419,35 @@ fn circles_positioned_relative_to_the_axes(show: bool) {
 }
 
 fn highlighting_clusters_of_scatter_points_with_circle_shapes(show: bool) {
-    let rng = thread_rng();
+    let mut rng = thread_rng();
     let x0 = Normal::new(2., 0.45)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(300)
         .collect::<Vec<f64>>();
     let y0 = Normal::new(2., 0.45)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(300)
         .collect::<Vec<f64>>();
     let x1 = Normal::new(6., 0.4)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(300)
         .collect::<Vec<f64>>();
     let y1 = Normal::new(6., 0.4)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(300)
         .collect::<Vec<f64>>();
     let x2 = Normal::new(4., 0.3)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(300)
         .collect::<Vec<f64>>();
     let y2 = Normal::new(4., 0.3)
         .unwrap()
-        .sample_iter(rng)
+        .sample_iter(&mut rng)
         .take(300)
         .collect::<Vec<f64>>();
 

plotly/examples/ndarray_support.rs

@@ -24,7 +24,7 @@ fn multiple_ndarray_traces_over_columns(show: bool) {
     let t: Array<f64, Ix1> = Array::range(0., 10., 10. / n as f64);
     let mut ys: Array<f64, Ix2> = Array::zeros((11, 11));
     let mut count = 0.;
-    for mut row in ys.gencolumns_mut() {
+    for mut row in ys.columns_mut() {
         for index in 0..row.len() {
             row[index] = count + (index as f64).powf(2.);
         }
@@ -49,7 +49,7 @@ fn multiple_ndarray_traces_over_rows(show: bool) {
     let t: Array<f64, Ix1> = Array::range(0., 10., 10. / n as f64);
     let mut ys: Array<f64, Ix2> = Array::zeros((11, 11));
     let mut count = 0.;
-    for mut row in ys.gencolumns_mut() {
+    for mut row in ys.columns_mut() {
         for index in 0..row.len() {
             row[index] = count + (index as f64).powf(2.);
         }

plotly/src/common/color.rs

@@ -1,7 +1,7 @@
 use serde::Serialize;
 
-#[serde(untagged)]
 #[derive(Serialize, Clone, Debug)]
+#[serde(untagged)]
 pub enum ColorWrapper {
     S(String),
     F(f64),
@@ -383,13 +383,13 @@ impl Color for f64 {
 
 fn string_types_to_color_wrapper<S: AsRef<str> + std::fmt::Display + Sized>(v: S) -> ColorWrapper {
     if v.as_ref().len() < 6 || v.as_ref().len() > 7 {
-        panic!(format!("{} is not a valid hex color!", v));
+        panic!("{} is not a valid hex color!", v);
     }
     if v.as_ref().len() == 6 && v.as_ref().starts_with('#') {
-        panic!(format!("{} is not a valid hex color!", v));
+        panic!("{} is not a valid hex color!", v);
     }
     if v.as_ref().len() == 7 && !v.as_ref().starts_with('#') {
-        panic!(format!("{} is not a valid hex color!", v));
+        panic!("{} is not a valid hex color!", v);
     }
     let valid_characters = "#ABCDEF0123456789";
     let mut s = v.as_ref().to_uppercase();
@@ -398,7 +398,7 @@ fn string_types_to_color_wrapper<S: AsRef<str> + std::fmt::Display + Sized>(v: S
     }
     for c in s.chars() {
         if !valid_characters.contains(c) {
-            panic!(format!("{} is not a valid hex color!", v));
+            panic!("{} is not a valid hex color!", v);
         }
     }
 

plotly_kaleido/src/lib.rs

@@ -16,6 +16,7 @@ use std::io::prelude::*;
 use std::io::BufReader;
 use std::path::{Path, PathBuf};
 use std::process::{Command, Stdio};
+use std::panic::panic_any;
 
 #[derive(Serialize)]
 struct PlotData {
@@ -78,7 +79,7 @@ impl Kaleido {
     pub fn new() -> Kaleido {
         let path = match Kaleido::binary_path() {
             Ok(path) => path,
-            Err(msg) => panic!(msg),
+            Err(msg) => panic_any(msg),
         };
 
         Kaleido { cmd_path: path }