diff options
Diffstat (limited to 'src/interactive')
| -rw-r--r-- | src/interactive/app/bytevis.rs | 4 | ||||
| -rw-r--r-- | src/interactive/app/handlers.rs | 7 | ||||
| -rw-r--r-- | src/interactive/widgets/mark.rs | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/interactive/app/bytevis.rs b/src/interactive/app/bytevis.rs index 70c7714..14c6201 100644 --- a/src/interactive/app/bytevis.rs +++ b/src/interactive/app/bytevis.rs @@ -30,9 +30,9 @@ impl ByteVisualization { Percentage => Bar, } } - pub fn display(&self, percentage: f32) -> DisplayByteVisualization { + pub fn display(self, percentage: f32) -> DisplayByteVisualization { DisplayByteVisualization { - format: *self, + format: self, percentage, } } diff --git a/src/interactive/app/handlers.rs b/src/interactive/app/handlers.rs index 20fc8ec..ceddfd0 100644 --- a/src/interactive/app/handlers.rs +++ b/src/interactive/app/handlers.rs @@ -69,11 +69,8 @@ impl TerminalApp { } pub fn open_that(&mut self) { - match self.state.selected { - Some(ref idx) => { + if let Some(ref idx) = self.state.selected { open::that(path_of(&self.traversal.tree, *idx)).ok(); - } - None => {} } } @@ -120,7 +117,7 @@ impl TerminalApp { }; self.state.selected = entries .get(next_selected_pos) - .or(entries.last()) + .or_else(|| entries.last()) .map(|b| b.index) .or(self.state.selected) } diff --git a/src/interactive/widgets/mark.rs b/src/interactive/widgets/mark.rs index 9ce6ed0..cf45c59 100644 --- a/src/interactive/widgets/mark.rs +++ b/src/interactive/widgets/mark.rs @@ -112,7 +112,7 @@ impl MarkPane { let entry_in_view = self .selected .map(|selected| selected) - .or(Some(marked.len().saturating_sub(1))); + .or_else(|| Some(marked.len().saturating_sub(1))); let selected = self.selected; let entries = marked .values() |