Merge pull request #82 from sorairolake/fix-clippy

chore: Apply clippy lints

Author: kennytm

src/canvas.rs

@@ -1796,7 +1796,7 @@ impl Canvas {
         let dark_modules = self.modules.iter().filter(|m| m.is_dark()).count();
         let total_modules = self.modules.len();
         let ratio = dark_modules * 200 / total_modules;
-        if ratio >= 100 { ratio - 100 } else { 100 - ratio }.as_u16()
+        ratio.abs_diff(100).as_u16()
     }
 
     /// Compute the penalty score for having too many light modules on the sides.

src/lib.rs

@@ -264,7 +264,7 @@ impl QrCode {
     ///
     /// Note: the `image` crate itself also provides method to rotate the image,
     /// or overlay a logo on top of the QR code.
-    pub fn render<P: Pixel>(&self) -> Renderer<P> {
+    pub fn render<P: Pixel>(&self) -> Renderer<'_, P> {
         let quiet_zone = if self.version.is_micro() { 2 } else { 4 };
         Renderer::new(&self.content, self.width, quiet_zone)
     }

src/optimize.rs

@@ -85,7 +85,7 @@ pub struct Parser<'a> {
     pending_single_byte: bool,
 }
 
-impl<'a> Parser<'a> {
+impl Parser<'_> {
     /// Creates a new iterator which parse the data into segments that only
     /// contains their exclusive subsets. No optimization is done at this point.
     ///
@@ -103,7 +103,7 @@ impl<'a> Parser<'a> {
     ///     ]
     /// );
     /// ```
-    pub fn new(data: &[u8]) -> Parser {
+    pub fn new(data: &[u8]) -> Parser<'_> {
         Parser {
             ecs_iter: EcsIter { base: data.iter(), index: 0, ended: false },
             state: State::Init,
@@ -113,7 +113,7 @@ impl<'a> Parser<'a> {
     }
 }
 
-impl<'a> Iterator for Parser<'a> {
+impl Iterator for Parser<'_> {
     type Item = Segment;
 
     fn next(&mut self) -> Option<Segment> {
@@ -124,10 +124,7 @@ impl<'a> Iterator for Parser<'a> {
         }
 
         loop {
-            let (i, ecs) = match self.ecs_iter.next() {
-                None => return None,
-                Some(a) => a,
-            };
+            let (i, ecs) = self.ecs_iter.next()?;
             let (next_state, action) = STATE_TRANSITION[self.state as usize + ecs as usize];
             self.state = next_state;
 
@@ -289,7 +286,7 @@ impl<I: Iterator<Item = Segment>> Optimizer<I> {
     }
 }
 
-impl<'a> Parser<'a> {
+impl Parser<'_> {
     pub fn optimize(self, version: Version) -> Optimizer<Self> {
         Optimizer::new(self, version)
     }

src/render/eps.rs

@@ -30,7 +30,7 @@ impl Pixel for Color {
     type Image = String;
 
     fn default_color(color: ModuleColor) -> Self {
-        Color(color.select(Default::default(), [1.0; 3]))
+        Self(color.select(Default::default(), [1.0; 3]))
     }
 }
 
@@ -45,7 +45,7 @@ impl RenderCanvas for Canvas {
     type Image = String;
 
     fn new(width: u32, height: u32, dark_pixel: Color, light_pixel: Color) -> Self {
-        Canvas {
+        Self {
             eps: format!(
                 concat!(
                     "%!PS-Adobe-3.0 EPSF-3.0\n",

src/render/string.rs

@@ -28,7 +28,7 @@ impl Element for char {
     }
 }
 
-impl<'a> Element for &'a str {
+impl Element for &str {
     fn default_color(color: Color) -> Self {
         color.select("\u{2588}", " ")
     }

src/render/unicode.rs

@@ -67,9 +67,9 @@ impl RenderCanvas for Canvas1x2 {
                 {
                     // Then zipping those 2 lines together into a single 2-bit number list.
                     if rows.len() == 2 {
-                        rows[0].iter().zip(rows[1]).map(|(top, bot)| (top * 2 + bot)).collect::<Vec<u8>>()
+                        rows[0].iter().zip(rows[1]).map(|(top, bot)| top * 2 + bot).collect::<Vec<u8>>()
                     } else {
-                        rows[0].iter().map(|top| (top * 2)).collect::<Vec<u8>>()
+                        rows[0].iter().map(|top| top * 2).collect::<Vec<u8>>()
                     }
                 }
                 .into_iter()