From 248dfbac08928e8f1341c0cddc49384924c5c49e Mon Sep 17 00:00:00 2001
From: Roy Ivy III <rivy.dev@gmail.com>
Date: Sun, 29 Dec 2019 00:43:41 -0600
Subject: [PATCH] refactor/polish ~ fix `cargo clippy` complaints
 (comparison_chain)

---
 src/hashsum/hashsum.rs | 10 +++++-----
 src/uptime/uptime.rs   | 22 ++++++++++------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/src/hashsum/hashsum.rs b/src/hashsum/hashsum.rs
index ad4514c77..6e58df21c 100644
--- a/src/hashsum/hashsum.rs
+++ b/src/hashsum/hashsum.rs
@@ -468,11 +468,11 @@ fn hashsum(
         }
     }
     if !status {
-        if bad_format == 1 {
-            show_warning!("{} line is improperly formatted", bad_format);
-        } else if bad_format > 1 {
-            show_warning!("{} lines are improperly formatted", bad_format);
-        }
+        match bad_format.cmp(&1) {
+            std::cmp::Ordering::Equal => show_warning!("{} line is improperly formatted", bad_format),
+            std::cmp::Ordering::Greater => show_warning!("{} lines are improperly formatted", bad_format),
+            _ => {}
+        };
         if failed > 0 {
             show_warning!("{} computed checksum did NOT match", failed);
         }
diff --git a/src/uptime/uptime.rs b/src/uptime/uptime.rs
index a37f1a321..73fca4716 100644
--- a/src/uptime/uptime.rs
+++ b/src/uptime/uptime.rs
@@ -137,11 +137,11 @@ fn process_utmpx() -> (Option<time_t>, usize) {
 }
 
 fn print_nusers(nusers: usize) {
-    if nusers == 1 {
-        print!("1 user,  ");
-    } else if nusers > 1 {
-        print!("{} users,  ", nusers);
-    }
+    match nusers.cmp(&1) {
+        std::cmp::Ordering::Equal => print!("1 user,  "),
+        std::cmp::Ordering::Greater => print!("{} users,  ", nusers),
+        _ => {}
+    };
 }
 
 fn print_time() {
@@ -188,11 +188,9 @@ fn print_uptime(upsecs: i64) {
     let updays = upsecs / 86400;
     let uphours = (upsecs - (updays * 86400)) / 3600;
     let upmins = (upsecs - (updays * 86400) - (uphours * 3600)) / 60;
-    if updays == 1 {
-        print!("up {:1} day, {:2}:{:02},  ", updays, uphours, upmins);
-    } else if updays > 1 {
-        print!("up {:1} days, {:2}:{:02},  ", updays, uphours, upmins);
-    } else {
-        print!("up  {:2}:{:02}, ", uphours, upmins);
-    }
+    match updays.cmp(&1) {
+        std::cmp::Ordering::Equal => print!("up {:1} day, {:2}:{:02},  ", updays, uphours, upmins),
+        std::cmp::Ordering::Greater => print!("up {:1} days, {:2}:{:02},  ", updays, uphours, upmins),
+        _ => print!("up  {:2}:{:02}, ", uphours, upmins),
+    };
 }