diff options
| author | Sebastian Thiel <sebastian.thiel@icloud.com> | 2020-03-30 09:07:34 +0800 |
|---|---|---|
| committer | Sebastian Thiel <sebastian.thiel@icloud.com> | 2020-03-30 09:07:34 +0800 |
| commit | 70b043abfd4a5765b4966cff65a7b67c518528ef (patch) | |
| tree | 29db397fcd45c5fb60ce72025f65c4e13a496678 | |
| parent | f3505ec9f67abd9d4ce51c3b91d3d1edc6003ee0 (diff) | |
clippy
| -rw-r--r-- | src/interactive/app/eventloop.rs | 6 | ||||
| -rw-r--r-- | src/interactive/widgets/footer.rs | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/interactive/app/eventloop.rs b/src/interactive/app/eventloop.rs index d97a170..c26d536 100644 --- a/src/interactive/app/eventloop.rs +++ b/src/interactive/app/eventloop.rs @@ -160,6 +160,8 @@ pub struct TerminalApp { pub window: MainWindow, } +type KeyboardInputAndApp = (flume::Receiver<io::Result<Key>>, TerminalApp); + impl TerminalApp { pub fn process_events<B>( &mut self, @@ -185,7 +187,7 @@ impl TerminalApp { options: WalkOptions, input: Vec<PathBuf>, mode: Interaction, - ) -> Result<Option<(flume::Receiver<io::Result<Key>>, TerminalApp)>, Error> + ) -> Result<Option<KeyboardInputAndApp>, Error> where B: Backend, { @@ -200,7 +202,7 @@ impl TerminalApp { Interaction::Full => drop(std::thread::spawn(move || { let keys = std::io::stdin().keys(); for key in keys { - if let Err(_) = keys_tx.send(key) { + if keys_tx.send(key).is_err() { break; } } diff --git a/src/interactive/widgets/footer.rs b/src/interactive/widgets/footer.rs index 16c4965..f89bae5 100644 --- a/src/interactive/widgets/footer.rs +++ b/src/interactive/widgets/footer.rs @@ -31,7 +31,7 @@ impl Footer { format!( " Total disk usage: {} Entries: {} ", match total_bytes { - Some(b) => format!("{}", format.display(*b)).to_owned(), + Some(b) => format!("{}", format.display(*b)), None => "-".to_owned(), }, entries_traversed, |