From 57d7d00701f19ec31a545d71604876eddafc8ccd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20R=C3=BC=C3=9Fler?= Date: Tue, 5 Aug 2025 19:02:26 +0200 Subject: [PATCH] Fix clippy errors on nightly (#2688) --- src/popups/file_revlog.rs | 4 ++-- src/popups/push.rs | 4 ++-- src/popups/push_tags.rs | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/popups/file_revlog.rs b/src/popups/file_revlog.rs index 6bbbffbe..62acf1c7 100644 --- a/src/popups/file_revlog.rs +++ b/src/popups/file_revlog.rs @@ -251,8 +251,8 @@ impl FileRevlogPopup { }; let revisions = self.get_max_selection(); - self.open_request.as_ref().map_or( - "".into(), + self.open_request.as_ref().map_or_else( + || "".into(), |open_request| { strings::file_log_title( &open_request.file_path, diff --git a/src/popups/push.rs b/src/popups/push.rs index 8bf1bdcb..b7dff071 100644 --- a/src/popups/push.rs +++ b/src/popups/push.rs @@ -195,8 +195,8 @@ impl PushPopup { pub fn get_progress( progress: Option<&RemoteProgress>, ) -> (String, u8) { - progress.as_ref().map_or( - (strings::PUSH_POPUP_PROGRESS_NONE.into(), 0), + progress.as_ref().map_or_else( + || (strings::PUSH_POPUP_PROGRESS_NONE.into(), 0), |progress| { ( Self::progress_state_name(&progress.state), diff --git a/src/popups/push_tags.rs b/src/popups/push_tags.rs index 07d139f3..420df0b8 100644 --- a/src/popups/push_tags.rs +++ b/src/popups/push_tags.rs @@ -131,8 +131,8 @@ impl PushTagsPopup { pub fn get_progress( progress: Option<&PushTagsProgress>, ) -> (String, u8) { - progress.as_ref().map_or( - (strings::PUSH_POPUP_PROGRESS_NONE.into(), 0), + progress.as_ref().map_or_else( + || (strings::PUSH_POPUP_PROGRESS_NONE.into(), 0), |progress| { ( Self::progress_state_name(progress),