From 7a225fe732d3eddf3f5dc3bfbda6d56a93e266be Mon Sep 17 00:00:00 2001
From: merkrafter <merkrafter@gmail.com>
Date: Wed, 10 Nov 2021 22:39:41 +0100
Subject: [PATCH] Apply clippy suggestions

---
 src/bin/hexyl.rs | 7 +++----
 src/squeezer.rs  | 8 ++++----
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/bin/hexyl.rs b/src/bin/hexyl.rs
index 7463ef7..6373f77 100644
--- a/src/bin/hexyl.rs
+++ b/src/bin/hexyl.rs
@@ -245,8 +245,7 @@ fn run() -> Result<(), AnyhowError> {
             ))
         })
         .transpose()?
-        .unwrap_or(0)
-        .into();
+        .unwrap_or(0);
 
     let stdout = io::stdout();
     let mut stdout_lock = stdout.lock();
@@ -276,7 +275,7 @@ fn main() {
                 clap::ErrorKind::VersionDisplayed => {
                     // Version output in clap 2.33.1 (dep as of now) doesn't have a newline
                     // and the fix is not included even in the latest stable release
-                    println!("");
+                    println!();
                     std::process::exit(0)
                 }
                 _ => (),
@@ -457,7 +456,7 @@ fn parse_byte_offset(n: &str, block_size: PositiveI64) -> Result<ByteOffset, Byt
     }
 
     num.checked_mul(unit.get_multiplier())
-        .ok_or_else(|| UnitMultiplicationOverflow)
+        .ok_or(UnitMultiplicationOverflow)
         .and_then(into_byte_offset)
 }
 
diff --git a/src/squeezer.rs b/src/squeezer.rs
index 1512fb4..5f3fb25 100644
--- a/src/squeezer.rs
+++ b/src/squeezer.rs
@@ -80,10 +80,10 @@ impl Squeezer {
 
     pub fn active(&self) -> bool {
         use self::SqueezeState::*;
-        match self.state {
-            Squeeze | SqueezeActive | SqueezeFirstLine | SqueezeActiveFirstLine => true,
-            _ => false,
-        }
+        matches!(
+            self.state,
+            Squeeze | SqueezeActive | SqueezeFirstLine | SqueezeActiveFirstLine
+        )
     }
 
     pub fn action(&self) -> SqueezeAction {