Fixes from Clippy

Author: milliams

src/axis.rs

@@ -111,8 +111,7 @@ impl TickSteps {
         let overflow = start_options[0] * 10.0;
         let curr = start_options
             .iter()
-            .skip_while(|&step| step < &start)
-            .next();
+            .find(|&step| step >= &start);
 
         TickSteps {
             next: *curr.unwrap_or(&overflow),
@@ -138,8 +137,7 @@ impl Iterator for TickSteps {
         let overflow = curr_steps[0] * 10.0;
         self.next = *curr_steps
             .iter()
-            .skip_while(|&s| s <= &curr)
-            .next()
+            .find(|&s| s > &curr)
             .unwrap_or(&overflow);
         Some(curr)
     }
@@ -148,7 +146,7 @@ impl Iterator for TickSteps {
 fn generate_ticks(min: f64, max: f64, step_size: f64) -> Vec<f64> {
     // "fix" just makes sure there are no floating-point errors
     fn fix(x: f64) -> f64 {
-        const PRECISION: f64 = 100000_f64;
+        const PRECISION: f64 = 100_000_f64;
         (x * PRECISION).round() / PRECISION
     }
 
@@ -203,8 +201,7 @@ fn calculate_tick_step_for_range(min: f64, max: f64, max_ticks: usize) -> f64 {
     let min_tick_step = range / max_ticks as f64;
     // Get the first entry which is our smallest possible tick step size
     let smallest_valid_step = TickSteps::start_at(min_tick_step)
-        .skip_while(|&s| number_of_ticks(min, max, s) > max_ticks)
-        .next()
+        .find(|&s| number_of_ticks(min, max, s) <= max_ticks)
         .expect("ERROR: We've somehow run out of tick step options!");
     // Count how many ticks that relates to
     let actual_num_ticks = number_of_ticks(min, max, smallest_valid_step);

src/repr/boxplot.rs

@@ -35,7 +35,7 @@ pub struct BoxPlot<'a> {
 }
 
 impl<'a> BoxPlot<'a> {
-    pub fn from_slice(v: &'a [(f64)]) -> Self {
+    pub fn from_slice(v: &'a [f64]) -> Self {
         BoxPlot {
             data: BoxData::Ref(v),
             style: BoxStyle::new(),

src/style.rs

@@ -38,7 +38,7 @@ impl LineStyle {
         }
 
         if let Some(ref v) = other.linejoin {
-            self.linejoin = Some(v.clone())
+            self.linejoin = Some(*v)
         }
     }
     pub fn colour<T>(mut self, value: T) -> Self
@@ -101,7 +101,7 @@ impl PointStyle {
 
     pub fn overlay(&mut self, other: &Self) {
         if let Some(ref v) = other.marker {
-            self.marker = Some(v.clone())
+            self.marker = Some(*v)
         }
 
         if let Some(ref v) = other.colour {

src/text_render.rs

@@ -29,7 +29,7 @@ fn tick_offset_map(axis: &axis::ContinuousAxis, face_width: u32) -> HashMap<i32,
 /// Given a histogram object,
 /// the total scale of the axis
 /// and the number of face cells to work with,
-/// create a mapping of cell offset to bin bound
+/// return which cells will contain a bin bound
 fn bound_cell_offsets(
     hist: &repr::Histogram,
     x_axis: &axis::ContinuousAxis,
@@ -60,24 +60,24 @@ fn bins_for_cells(bound_cell_offsets: &[i32], face_width: u32) -> Vec<Option<i32
     }
     cell_bins.push(None); // end with an appended positive null
 
-    if *bins_cell_offset < 0 {
+    if *bins_cell_offset <= 0 {
         cell_bins = cell_bins
             .iter()
             .skip(bins_cell_offset.wrapping_abs() as usize)
             .cloned()
             .collect();
-    } else if *bins_cell_offset > 0 {
+    } else {
         let mut new_bins = vec![None; (*bins_cell_offset) as usize];
         new_bins.extend(cell_bins.iter());
         cell_bins = new_bins;
     }
 
-    if cell_bins.len() < face_width as usize + 2 {
+    if cell_bins.len() <= face_width as usize + 2 {
         let deficit = face_width as usize + 2 - cell_bins.len();
         let mut new_bins = cell_bins;
         new_bins.extend(vec![None; deficit].iter());
         cell_bins = new_bins;
-    } else if cell_bins.len() > face_width as usize + 2 {
+    } else {
         let new_bins = cell_bins;
         cell_bins = new_bins
             .iter()
@@ -429,7 +429,7 @@ pub fn overlay(under: &str, over: &str, x: i32, y: i32) -> String {
         let new_lines: Vec<String> = (0..lines_deficit)
             .map(|_| (0..over_width).map(|_| ' ').collect::<String>())
             .collect();
-        let mut temp = split_over.clone();
+        let mut temp = split_over;
         for new_line in new_lines {
             temp.push(new_line);
         }
@@ -616,7 +616,6 @@ mod tests {
 
     #[test]
     fn test_render_face_points() {
-        use crate::repr;
         use crate::style::PointStyle;
         let data = vec![
             (-3.0, 2.3),

src/utils.rs

@@ -39,6 +39,7 @@ pub fn quartiles(s: &[f64]) -> (f64, f64, f64) {
     (median(a), median(&s), median(b))
 }
 
+/// Given a slice of numbers, return the minimum and maximum values
 pub fn range(s: &[f64]) -> (f64, f64) {
     let mut min = f64::INFINITY;
     let mut max = f64::NEG_INFINITY;
@@ -49,9 +50,7 @@ pub fn range(s: &[f64]) -> (f64, f64) {
     (min, max)
 }
 
-/**
-Floor or ceiling the min or max to zero to avoid them both having the same value
-*/
+/// Floor or ceiling the min or max to zero to avoid them both having the same value
 pub fn pad_range_to_zero(min: f64, max: f64) -> (f64, f64) {
     if (min - max).abs() < std::f64::EPSILON {
         (if min > 0. {0.} else {min}, if max < 0. {0.} else {max})