clippy lints (#95)

Author: mfreeborn

plotly/examples/scientific_charts.rs

@@ -1,7 +1,8 @@
+use std::f64::consts::PI;
+
 use plotly::common::{ColorScale, ColorScalePalette, Title};
 use plotly::contour::Contours;
 use plotly::{Contour, HeatMap, Layout, Plot};
-use std::f64::consts::PI;
 
 // Contour Plots
 fn simple_contour_plot(show: bool) {
@@ -16,16 +17,15 @@ fn simple_contour_plot(show: bool) {
         y.push(value);
     }
 
-    for xi in 0..n {
+    x.iter().take(n).for_each(|x| {
         let mut row = Vec::<f64>::new();
-        for yi in 0..n {
-            let radius_squared = x[xi].powf(2.0) + y[yi].powf(2.0);
-            let zv =
-                x[xi].sin() * y[yi].cos() * radius_squared.sin() / (radius_squared + 1.0).log10();
+        y.iter().take(n).for_each(|y| {
+            let radius_squared = x.powf(2.0) + y.powf(2.0);
+            let zv = x.sin() * y.cos() * radius_squared.sin() / (radius_squared + 1.0).log10();
             row.push(zv);
-        }
+        });
         z.push(row);
-    }
+    });
 
     let trace = Contour::new(x, y, z);
     let mut plot = Plot::new();

plotly/src/common/color.rs

@@ -30,10 +30,11 @@ impl Color for String {}
 impl Color for Rgb {}
 impl Color for Rgba {}
 
-/// ColorArray is only used internally to provide a helper method for converting Vec<impl Color2> to
-/// Vec<Box<dyn Color2>>, as we would otherwise fall foul of the orphan rules.
+/// ColorArray is only used internally to provide a helper method for converting Vec<impl Color> to
+/// Vec<Box<dyn Color>>, as we would otherwise fall foul of the orphan rules.
 pub(crate) struct ColorArray<C: Color>(pub(crate) Vec<C>);
 
+#[allow(clippy::from_over_into)]
 impl<C: Color> Into<Vec<Box<dyn Color>>> for ColorArray<C> {
     fn into(self) -> Vec<Box<dyn Color>> {
         self.0

plotly/src/common/mod.rs

@@ -187,7 +187,7 @@ where
     Vector(Vec<T>),
 }
 
-#[derive(Serialize, Clone, Debug, PartialEq)]
+#[derive(Serialize, Clone, Debug, PartialEq, Eq)]
 #[serde(rename_all = "lowercase")]
 pub enum PlotType {
     Scatter,

plotly/src/layout/mod.rs

@@ -2328,12 +2328,14 @@ impl Template {
     }
 }
 
+#[allow(clippy::from_over_into)]
 impl Into<Cow<'static, Template>> for Template {
     fn into(self) -> Cow<'static, Template> {
         Cow::Owned(self)
     }
 }
 
+#[allow(clippy::from_over_into)]
 impl Into<Cow<'static, Template>> for &'static Template {
     fn into(self) -> Cow<'static, Template> {
         Cow::Borrowed(self)

plotly/src/layout/themes.rs

@@ -7,8 +7,7 @@ use crate::{
 
 pub static DEFAULT: Lazy<Template> = Lazy::new(|| {
     let layout_template = LayoutTemplate::new();
-    let template = Template::new().layout(layout_template);
-    template
+    Template::new().layout(layout_template)
 });
 
 pub static PLOTLY_WHITE: Lazy<Template> = Lazy::new(|| {
@@ -82,8 +81,7 @@ pub static PLOTLY_WHITE: Lazy<Template> = Lazy::new(|| {
                 .zero_line_color("#EBF0F8")
                 .zero_line_width(2),
         );
-    let template = Template::new().layout(layout_template);
-    template
+    Template::new().layout(layout_template)
 });
 
 pub static PLOTLY_DARK: Lazy<Template> = Lazy::new(|| {
@@ -159,8 +157,7 @@ pub static PLOTLY_DARK: Lazy<Template> = Lazy::new(|| {
                 .zero_line_color("#283442")
                 .zero_line_width(2),
         );
-    let template = Template::new().layout(layout_template);
-    template
+    Template::new().layout(layout_template)
 });
 
 #[cfg(test)]

plotly/src/ndarray.rs

@@ -1,4 +1,4 @@
-#[derive(PartialOrd, PartialEq)]
+#[derive(PartialOrd, PartialEq, Eq)]
 pub enum ArrayTraces {
     OverColumns,
     OverRows,

plotly/src/plot.rs

@@ -1,3 +1,7 @@
+use std::fs::File;
+use std::io::Write;
+use std::path::Path;
+
 use askama::Template;
 use dyn_clone::DynClone;
 use erased_serde::Serialize as ErasedSerialize;
@@ -6,9 +10,6 @@ use rand::{
     thread_rng,
 };
 use serde::Serialize;
-use std::fs::File;
-use std::io::Write;
-use std::path::Path;
 
 use crate::{Configuration, Layout};
 
@@ -122,6 +123,10 @@ impl Traces {
         self.traces.len()
     }
 
+    pub fn is_empty(&self) -> bool {
+        self.traces.is_empty()
+    }
+
     pub fn iter(&self) -> std::slice::Iter<'_, Box<dyn Trace>> {
         self.traces.iter()
     }
@@ -466,9 +471,10 @@ impl PartialEq for Plot {
 
 #[cfg(test)]
 mod tests {
-    use serde_json::{json, to_value};
     use std::path::PathBuf;
 
+    use serde_json::{json, to_value};
+
     use super::*;
     use crate::Scatter;
 

plotly/src/private.rs

@@ -1,9 +1,9 @@
+#[cfg(feature = "plotly_ndarray")]
+use ndarray::{Array, Ix2};
 use serde::Serialize;
 
 #[cfg(feature = "plotly_ndarray")]
 use crate::ndarray::ArrayTraces;
-#[cfg(feature = "plotly_ndarray")]
-use ndarray::{Array, Ix2};
 
 pub fn owned_string_vector<S: AsRef<str>>(s: Vec<S>) -> Vec<String> {
     s.iter()
@@ -159,13 +159,13 @@ mod tests {
         let x: NumOrString = 100.0_f32.into();
         assert_eq!(x, NumOrString::F(100.));
 
-        let x: NumOrString = (-100 as isize).into();
+        let x: NumOrString = (-100_isize).into();
         assert_eq!(x, NumOrString::I(-100));
 
-        let x: NumOrString = (-100 as i64).into();
+        let x: NumOrString = (-100_i64).into();
         assert_eq!(x, NumOrString::I(-100));
 
-        let x: NumOrString = (-100 as i32).into();
+        let x: NumOrString = (-100_i32).into();
         assert_eq!(x, NumOrString::I(-100));
 
         let x: NumOrString = 100_usize.into();

plotly_kaleido/build.rs

@@ -1,13 +1,15 @@
 extern crate directories;
 extern crate zip;
-use directories::ProjectDirs;
+
 use std::env;
 use std::fs;
 use std::io;
 use std::io::Result;
 use std::path::{Path, PathBuf};
 use std::process::Command;
 
+use directories::ProjectDirs;
+
 #[cfg(target_os = "linux")]
 const KALEIDO_URL: &str =
     "https://github.com/plotly/Kaleido/releases/download/v0.2.1/kaleido_linux_x64.zip";
@@ -50,7 +52,7 @@ fn extract_zip(p: &Path, zip_file: &Path) -> Result<()> {
             }
         }
 
-        if (&*file.name()).ends_with('/') {
+        if (file.name()).ends_with('/') {
             println!(
                 "File {} extracted to \"{}\"",
                 i,