From 59183a53838c186d4a5a4540bb50ce41148a4ec9 Mon Sep 17 00:00:00 2001
From: Henry Schimke <henry@azule.info>
Date: Tue, 10 Jan 2023 14:36:11 -0600
Subject: [PATCH] cargo clippy --fix

---
 src/aztec/DecoderTest.rs                             | 8 ++++----
 src/aztec/EncoderTest.rs                             | 8 ++++----
 src/common/bit_matrix.rs                             | 4 ++--
 src/common/detector/monochrome_rectangle_detector.rs | 2 +-
 src/common/detector/white_rectangle_detector.rs      | 2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/aztec/DecoderTest.rs b/src/aztec/DecoderTest.rs
index b59ac1a..e18c5dc 100644
--- a/src/aztec/DecoderTest.rs
+++ b/src/aztec/DecoderTest.rs
@@ -113,7 +113,7 @@ X X     X X X     X X X X     X X X     X X
         "  ",
     )
     .expect("Bitmatrix should init");
-    let r = AztecDetectorRXingResult::new(matrix, NO_POINTS.clone(), false, 30, 2);
+    let r = AztecDetectorRXingResult::new(matrix, NO_POINTS, false, 30, 2);
     let result = decoder::decode(&r).expect("decoder should init");
     assert_eq!("88888TTTTTTTTTTTTTTTTTTTTTTTTTTTTTT", result.getText());
     assert_eq!(
@@ -173,7 +173,7 @@ X     X       X X   X X X       X     ",
         "  ",
     )
     .expect("string parse success");
-    let r = AztecDetectorRXingResult::new(matrix, NO_POINTS.clone(), false, 15, 1);
+    let r = AztecDetectorRXingResult::new(matrix, NO_POINTS, false, 15, 1);
     let result = decoder::decode(&r).expect("decode success");
     assert_eq!("Français", result.getText());
 }
@@ -214,7 +214,7 @@ X X . X . X . . . X . X . . . . X X . X . . X X . . . ",
         ". ",
     )
     .expect("parse string failed");
-    let r = AztecDetectorRXingResult::new(matrix, NO_POINTS.clone(), true, 16, 4);
+    let r = AztecDetectorRXingResult::new(matrix, NO_POINTS, true, 16, 4);
     assert!(decoder::decode(&r).is_ok());
 }
 
@@ -254,7 +254,7 @@ X X . . . X X . . X . X . . . . X X . X . . X . X . X ",
         ". ",
     )
     .expect("String Parse failed");
-    let r = AztecDetectorRXingResult::new(matrix, NO_POINTS.clone(), true, 16, 4);
+    let r = AztecDetectorRXingResult::new(matrix, NO_POINTS, true, 16, 4);
     assert!(decoder::decode(&r).is_ok());
 }
 
diff --git a/src/aztec/EncoderTest.rs b/src/aztec/EncoderTest.rs
index d2ad3a1..9734556 100644
--- a/src/aztec/EncoderTest.rs
+++ b/src/aztec/EncoderTest.rs
@@ -671,7 +671,7 @@ fn testEncodeDecode(data: &str, compact: bool, layers: u32) {
     let mut matrix = aztec.getMatrix().clone();
     let mut r = AztecDetectorRXingResult::new(
         matrix.clone(),
-        NO_POINTS.clone(),
+        NO_POINTS,
         aztec.isCompact(),
         aztec.getCodeWords(),
         aztec.getLayers(),
@@ -698,7 +698,7 @@ fn testEncodeDecode(data: &str, compact: bool, layers: u32) {
     );
     r = AztecDetectorRXingResult::new(
         matrix,
-        NO_POINTS.clone(),
+        NO_POINTS,
         aztec.isCompact(),
         aztec.getCodeWords(),
         aztec.getLayers(),
@@ -751,7 +751,7 @@ fn testWriter(
 
     let mut r = AztecDetectorRXingResult::new(
         matrix.clone(),
-        NO_POINTS.clone(),
+        NO_POINTS,
         aztec.isCompact(),
         aztec.getCodeWords(),
         aztec.getLayers(),
@@ -780,7 +780,7 @@ fn testWriter(
     }
     r = AztecDetectorRXingResult::new(
         matrix,
-        NO_POINTS.clone(),
+        NO_POINTS,
         aztec.isCompact(),
         aztec.getCodeWords(),
         aztec.getLayers(),
diff --git a/src/common/bit_matrix.rs b/src/common/bit_matrix.rs
index 3c638c8..75c35ab 100644
--- a/src/common/bit_matrix.rs
+++ b/src/common/bit_matrix.rs
@@ -209,8 +209,8 @@ impl BitMatrix {
 
     #[inline(always)]
     fn get_offset(&self, y: u32, x: u32) -> usize {
-        let offset = y as usize * self.row_size + (x as usize / 32);
-        offset
+        
+        y as usize * self.row_size + (x as usize / 32)
     }
 
     pub fn try_get(&self, x: u32, y: u32) -> Result<bool, Exceptions> {
diff --git a/src/common/detector/monochrome_rectangle_detector.rs b/src/common/detector/monochrome_rectangle_detector.rs
index bc3665f..8e31bc9 100644
--- a/src/common/detector/monochrome_rectangle_detector.rs
+++ b/src/common/detector/monochrome_rectangle_detector.rs
@@ -35,7 +35,7 @@ pub struct MonochromeRectangleDetector<'a> {
 
 impl<'a> MonochromeRectangleDetector<'_> {
     pub fn new(image: &'a BitMatrix) -> MonochromeRectangleDetector<'a> {
-        MonochromeRectangleDetector { image: image }
+        MonochromeRectangleDetector { image }
     }
 
     /**
diff --git a/src/common/detector/white_rectangle_detector.rs b/src/common/detector/white_rectangle_detector.rs
index afd9dde..509a325 100644
--- a/src/common/detector/white_rectangle_detector.rs
+++ b/src/common/detector/white_rectangle_detector.rs
@@ -81,7 +81,7 @@ impl<'a> WhiteRectangleDetector<'_> {
         }
 
         Ok(WhiteRectangleDetector {
-            image: image,
+            image,
             height: image.getHeight() as i32,
             width: image.getWidth() as i32,
             leftInit,