From 6ca9e6ca52a4d4d32036df2914ee773ab313397b Mon Sep 17 00:00:00 2001
From: Sebastian Thiel <sebastian.thiel@icloud.com>
Date: Mon, 15 Feb 2021 14:38:53 +0800
Subject: thanks clippy

---
 src/interactive/widgets/main.rs | 12 ++----------
 src/interactive/widgets/mark.rs |  6 +++---
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'src/interactive/widgets')

diff --git a/src/interactive/widgets/main.rs b/src/interactive/widgets/main.rs
index 64755c9..cce01c0 100644
--- a/src/interactive/widgets/main.rs
+++ b/src/interactive/widgets/main.rs
@@ -118,11 +118,7 @@ impl MainWindow {
         if let Some((help_area, pane)) = help_pane {
             let props = HelpPaneProps {
                 border_style: help_style,
-                has_focus: if let Help = state.focussed {
-                    true
-                } else {
-                    false
-                },
+                has_focus: matches!(state.focussed, Help),
             };
             pane.render(props, help_area, buf);
         }
@@ -136,11 +132,7 @@ impl MainWindow {
             marked,
             selected: state.selected,
             border_style: entries_style,
-            is_focussed: if let Main = state.focussed {
-                true
-            } else {
-                false
-            },
+            is_focussed: matches!(state.focussed, Main),
         };
         self.entries_pane.render(props, entries_area, buf);
 
diff --git a/src/interactive/widgets/mark.rs b/src/interactive/widgets/mark.rs
index b165415..0b38e99 100644
--- a/src/interactive/widgets/mark.rs
+++ b/src/interactive/widgets/mark.rs
@@ -105,7 +105,7 @@ impl MarkPane {
     pub fn process_events(mut self, key: Key) -> Option<(Self, Option<MarkMode>)> {
         let action = None;
         match key {
-            Ctrl('r') => return self.prepare_deletion(),
+            Ctrl('r') => return Some(self.prepare_deletion()),
             Char('x') | Char('d') | Char(' ') => {
                 return self.remove_selected().map(|s| (s, action))
             }
@@ -174,12 +174,12 @@ impl MarkPane {
             d.num_errors_during_deletion = num_errors;
         }
     }
-    fn prepare_deletion(mut self) -> Option<(Self, Option<MarkMode>)> {
+    fn prepare_deletion(mut self) -> (Self, Option<MarkMode>) {
         for entry in self.marked.values_mut() {
             entry.num_errors_during_deletion = 0;
         }
         self.selected = Some(0);
-        Some((self, Some(MarkMode::Delete)))
+        (self, Some(MarkMode::Delete))
     }
     fn remove_selected(mut self) -> Option<Self> {
         if let Some(mut selected) = self.selected {
-- 
cgit v1.2.3