From 764348871625d6ac005675b8aa19817dce5ca70b Mon Sep 17 00:00:00 2001
From: erle638f <erion.leka@mailbox.tu-dresden.de>
Date: Sun, 6 Oct 2024 21:50:49 +0200
Subject: [PATCH] Clippy fixes

---
 src/decode.rs        | 17 +++++++++--------
 src/identify/grid.rs |  5 +----
 src/lib.rs           |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/src/decode.rs b/src/decode.rs
index 04c88f8..0b8ae22 100644
--- a/src/decode.rs
+++ b/src/decode.rs
@@ -6,7 +6,6 @@ use g2p::{g2p, GaloisField};
 use crate::version_db::{RSParameters, VERSION_DATA_BASE};
 use crate::{BitGrid, DeQRError, DeQRResult};
 
-
 g2p!(GF16, 4, modulus: 0b1_0011);
 g2p!(GF256, 8, modulus: 0b1_0001_1101);
 
@@ -34,7 +33,6 @@ impl Version {
     }
 }
 
-
 /// MetaData for a QR grid
 ///
 /// Stores information about the size/version of given grid. Also contains
@@ -55,6 +53,12 @@ pub struct RawData {
     len: usize,
 }
 
+impl Default for RawData {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
 impl RawData {
     pub fn new() -> Self {
         RawData {
@@ -124,7 +128,7 @@ where
 }
 
 //Getter method that extracts the raw data of a QR Code
-pub fn get_raw(code: &dyn BitGrid) -> DeQRResult<(MetaData ,RawData)>{
+pub fn get_raw(code: &dyn BitGrid) -> DeQRResult<(MetaData, RawData)> {
     let meta = read_format(code)?;
     let raw = read_data(code, &meta, false);
     Ok((meta, raw))
@@ -567,10 +571,8 @@ fn read_data(code: &dyn BitGrid, meta: &MetaData, remove_mask: bool) -> RawData
 // This allows bits to be read as they appear "physically" in the QR code or with the mask removed, reflecting the actual code.
 fn read_bit(code: &dyn BitGrid, meta: &MetaData, y: usize, x: usize, remove_mask: bool) -> bool {
     let mut v = code.bit(y, x) as u8;
-    if remove_mask {
-        if mask_bit(meta.mask, y, x) {
-            v ^= 1
-        }
+    if remove_mask && mask_bit(meta.mask, y, x) {
+        v ^= 1
     }
 
     v != 0
@@ -590,7 +592,6 @@ fn mask_bit(mask: u16, y: usize, x: usize) -> bool {
     }
 }
 
-
 fn reserved_cell(version: Version, i: usize, j: usize) -> bool {
     let ver = &VERSION_DATA_BASE[version.0];
     let size = version.0 * 4 + 17;
diff --git a/src/identify/grid.rs b/src/identify/grid.rs
index 8a58817..e05cad8 100644
--- a/src/identify/grid.rs
+++ b/src/identify/grid.rs
@@ -100,10 +100,7 @@ impl SkewedGridLocation {
 
         let c = setup_perspective(img, &group, align, grid_size)?;
 
-        Some(SkewedGridLocation {
-            grid_size,
-            c,
-        })
+        Some(SkewedGridLocation { grid_size, c })
     }
 
     /// Convert into a grid referencing the underlying image as source
diff --git a/src/lib.rs b/src/lib.rs
index 7aa985b..0638002 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -34,7 +34,7 @@ If you have some other form of picture storage, you can use
 you to define your own source for images.
 "##
 )]
-pub use self::decode::{MetaData, Version, RawData};
+pub use self::decode::{MetaData, RawData, Version};
 pub(crate) use self::detect::{capstones_from_image, CapStone};
 pub use self::identify::Point;
 pub(crate) use self::identify::SkewedGridLocation;
@@ -94,7 +94,7 @@ where
         Ok((meta, out))
     }
 
-    pub fn get_raw_data(&self) -> DeQRResult<(MetaData, RawData)>{
+    pub fn get_raw_data(&self) -> DeQRResult<(MetaData, RawData)> {
         crate::decode::get_raw(&self.grid)
     }