From 9eea9af249870608551ea8188cdab17826036642 Mon Sep 17 00:00:00 2001
From: Abraham Toriz <categulario@gmail.com>
Date: Sat, 7 May 2022 23:37:30 +0800
Subject: [PATCH] fix linter

---
 src/commands/resume.rs |  2 +-
 src/interactive.rs     | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/commands/resume.rs b/src/commands/resume.rs
index a802168..a97f730 100644
--- a/src/commands/resume.rs
+++ b/src/commands/resume.rs
@@ -155,7 +155,7 @@ mod tests {
         assert_eq!(all_entries[1].note, Some("fake note".into()));
         assert_eq!(all_entries[1].sheet, "default");
 
-        assert_eq!(Ps(&String::from_utf8_lossy(&streams.out)), Ps("Resuming \"fake note\" from entry #1
+        assert_eq!(Ps(&String::from_utf8_lossy(&streams.out)), Ps("Resuming \"fake note\"
 Checked into sheet \"default\".\n"));
         assert_eq!(Ps(&String::from_utf8_lossy(&streams.err)), Ps(""));
     }
diff --git a/src/interactive.rs b/src/interactive.rs
index a94a5e2..b8b849d 100644
--- a/src/interactive.rs
+++ b/src/interactive.rs
@@ -1,5 +1,5 @@
 use std::io::{self, BufRead, Write};
-use std::collections::HashMap;
+use std::collections::{HashMap, hash_map};
 
 use crate::io::Streams;
 use crate::database::Database;
@@ -41,7 +41,7 @@ fn to_choice(s: String) -> Choice {
         } else {
             Choice::Number(n)
         }
-    } else if s == "" {
+    } else if s.is_empty() {
         Choice::CtrlD
     } else if s.to_lowercase() == "q" {
         Choice::Quit
@@ -64,18 +64,18 @@ where
     entries
         .into_iter().rev()
         .filter_map(|e| e.note.map(|n| (n, e.start)))
-        .map(|(n, s)| if uniques.contains_key(&n) {
-            false
-        } else {
-            uniques.insert(n, s);
+        .map(|(n, s)| if let hash_map::Entry::Vacant(e) = uniques.entry(n) {
+            e.insert(s);
             true
+        } else {
+            false
         })
         .filter(|&i| i)
         .take(facts.config.interactive_entries)
         .count();
 
     let mut uniques: Vec<_> = uniques.into_iter().collect();
-    uniques.sort_unstable_by_key(|(_n, s)| s.clone());
+    uniques.sort_unstable_by_key(|(_n, s)| *s);
 
     writeln!(streams.out, "Latest entries of sheet '{current_sheet}':\n")?;