fix linter
This commit is contained in:
parent
713193f682
commit
9eea9af249
|
@ -155,7 +155,7 @@ mod tests {
|
||||||
assert_eq!(all_entries[1].note, Some("fake note".into()));
|
assert_eq!(all_entries[1].note, Some("fake note".into()));
|
||||||
assert_eq!(all_entries[1].sheet, "default");
|
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"));
|
Checked into sheet \"default\".\n"));
|
||||||
assert_eq!(Ps(&String::from_utf8_lossy(&streams.err)), Ps(""));
|
assert_eq!(Ps(&String::from_utf8_lossy(&streams.err)), Ps(""));
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
use std::io::{self, BufRead, Write};
|
use std::io::{self, BufRead, Write};
|
||||||
use std::collections::HashMap;
|
use std::collections::{HashMap, hash_map};
|
||||||
|
|
||||||
use crate::io::Streams;
|
use crate::io::Streams;
|
||||||
use crate::database::Database;
|
use crate::database::Database;
|
||||||
|
@ -41,7 +41,7 @@ fn to_choice(s: String) -> Choice {
|
||||||
} else {
|
} else {
|
||||||
Choice::Number(n)
|
Choice::Number(n)
|
||||||
}
|
}
|
||||||
} else if s == "" {
|
} else if s.is_empty() {
|
||||||
Choice::CtrlD
|
Choice::CtrlD
|
||||||
} else if s.to_lowercase() == "q" {
|
} else if s.to_lowercase() == "q" {
|
||||||
Choice::Quit
|
Choice::Quit
|
||||||
|
@ -64,18 +64,18 @@ where
|
||||||
entries
|
entries
|
||||||
.into_iter().rev()
|
.into_iter().rev()
|
||||||
.filter_map(|e| e.note.map(|n| (n, e.start)))
|
.filter_map(|e| e.note.map(|n| (n, e.start)))
|
||||||
.map(|(n, s)| if uniques.contains_key(&n) {
|
.map(|(n, s)| if let hash_map::Entry::Vacant(e) = uniques.entry(n) {
|
||||||
false
|
e.insert(s);
|
||||||
} else {
|
|
||||||
uniques.insert(n, s);
|
|
||||||
true
|
true
|
||||||
|
} else {
|
||||||
|
false
|
||||||
})
|
})
|
||||||
.filter(|&i| i)
|
.filter(|&i| i)
|
||||||
.take(facts.config.interactive_entries)
|
.take(facts.config.interactive_entries)
|
||||||
.count();
|
.count();
|
||||||
|
|
||||||
let mut uniques: Vec<_> = uniques.into_iter().collect();
|
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")?;
|
writeln!(streams.out, "Latest entries of sheet '{current_sheet}':\n")?;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue