From 54455940187c2b4eec875e42bf60edfeefaf456d Mon Sep 17 00:00:00 2001 From: Stephan Dilly Date: Fri, 28 Aug 2020 23:56:39 +0200 Subject: [PATCH] fix amend due to blind clippy warning refactoring (closes #250) --- src/components/commit.rs | 8 ++++---- src/components/utils/statustree.rs | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/components/commit.rs b/src/components/commit.rs index 3643a586..650f28d4 100644 --- a/src/components/commit.rs +++ b/src/components/commit.rs @@ -208,10 +208,10 @@ impl CommitComponent { return Ok(()); } - let res = - self.amend.map_or(sync::commit(CWD, &msg), |amend| { - sync::amend(CWD, amend, &msg) - }); + let res = self.amend.map_or_else( + || sync::commit(CWD, &msg), + |amend| sync::amend(CWD, amend, &msg), + ); if let Err(e) = res { log::error!("commit error: {}", &e); self.queue.borrow_mut().push_back( diff --git a/src/components/utils/statustree.rs b/src/components/utils/statustree.rs index a5c6049a..aac54174 100644 --- a/src/components/utils/statustree.rs +++ b/src/components/utils/statustree.rs @@ -44,8 +44,8 @@ impl StatusTree { let last_selection_index = self.selection.unwrap_or(0); self.tree = FileTreeItems::new(list, &last_collapsed)?; - self.selection = last_selection.as_ref().map_or( - self.tree.items().first().map(|_| 0), + self.selection = last_selection.as_ref().map_or_else( + || self.tree.items().first().map(|_| 0), |last_selection| { self.find_last_selection( last_selection,