clippy

Author: milliams

src/function.rs

@@ -37,14 +37,12 @@ impl Style {
     }
 
     pub fn overlay(&mut self, other: &Self) {
-        match other.colour {
-            Some(ref v) => self.colour = Some(v.clone()),
-            None => {}
+        if let Some(ref v) = other.colour {
+            self.colour = Some(v.clone())
         }
 
-        match other.width {
-            Some(ref v) => self.width = Some(v.clone()),
-            None => {}
+        if let Some(ref v) = other.width {
+            self.width = Some(v.clone())
         }
     }
 }
@@ -97,7 +95,7 @@ impl Function {
     }
 
     pub fn style(mut self, style: &Style) -> Self {
-        self.style.overlay(&style);
+        self.style.overlay(style);
         self
     }
 

src/histogram.rs

@@ -40,9 +40,8 @@ impl Style {
     }
 
     pub fn overlay(&mut self, other: &Self) {
-        match other.fill {
-            Some(ref v) => self.fill = Some(v.clone()),
-            None => {}
+        if let Some(ref v) = other.fill {
+            self.fill = Some(v.clone())
         }
     }
 }
@@ -136,7 +135,7 @@ impl Histogram {
     }
 
     pub fn style(mut self, style: &Style) -> Self {
-        self.style.overlay(&style);
+        self.style.overlay(style);
         self
     }
 

src/scatter.rs

@@ -30,17 +30,16 @@ impl Style {
     }
 
     pub fn overlay(&mut self, other: &Self) {
-        match other.marker {
-            Some(ref v) => self.marker = Some(v.clone()),
-            None => {}
+        if let Some(ref v) = other.marker {
+            self.marker = Some(v.clone())
         }
-        match other.colour {
-            Some(ref v) => self.colour = Some(v.clone()),
-            None => {}
+
+        if let Some(ref v) = other.colour {
+            self.colour = Some(v.clone())
         }
-        match other.size {
-            Some(ref v) => self.size = Some(v.clone()),
-            None => {}
+
+        if let Some(ref v) = other.size {
+            self.size = Some(v.clone())
         }
     }
 }
@@ -105,7 +104,7 @@ impl Scatter {
     }
 
     pub fn style(mut self, style: &Style) -> Self {
-        self.style.overlay(&style);
+        self.style.overlay(style);
         self
     }
 

src/svg_render.rs

@@ -134,7 +134,10 @@ where
                         .set("cx", x_pos)
                         .set("cy", y_pos)
                         .set("r", radius)
-                        .set("fill", style.get_colour().clone().unwrap_or("".into())),
+                        .set(
+                            "fill",
+                            style.get_colour().clone().unwrap_or_else(|| "".into()),
+                        ),
                 );
             }
             style::Marker::Square => {
@@ -144,7 +147,10 @@ where
                         .set("y", y_pos - radius)
                         .set("width", 2. * radius)
                         .set("height", 2. * radius)
-                        .set("fill", style.get_colour().clone().unwrap_or("".into())),
+                        .set(
+                            "fill",
+                            style.get_colour().clone().unwrap_or_else(|| "".into()),
+                        ),
                 );
             }
             style::Marker::Cross => {
@@ -157,7 +163,10 @@ where
                 group.append(
                     node::element::Path::new()
                         .set("fill", "none")
-                        .set("stroke", style.get_colour().clone().unwrap_or("".into()))
+                        .set(
+                            "stroke",
+                            style.get_colour().clone().unwrap_or_else(|| "".into()),
+                        )
                         .set("stroke-width", 2)
                         .set("d", path),
                 );
@@ -193,7 +202,10 @@ where
             .set("height", count_scaled)
             .set(
                 "fill",
-                style.get_fill().clone().unwrap_or("burlywood".into()),
+                style
+                    .get_fill()
+                    .clone()
+                    .unwrap_or_else(|| "burlywood".into()),
             )
             .set("stroke", "black");
         group.append(rect);
@@ -237,7 +249,10 @@ where
     group.append(
         node::element::Path::new()
             .set("fill", "none")
-            .set("stroke", style.get_colour().clone().unwrap_or("".into()))
+            .set(
+                "stroke",
+                style.get_colour().clone().unwrap_or_else(|| "".into()),
+            )
             .set("stroke-width", style.get_width().clone().unwrap_or(2.))
             .set("d", path),
     );