From 85a55db66c6e6449441e6e799d9dcd0cf976cbb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20R=C3=BC=C3=9Fler?= Date: Sun, 25 Jan 2026 19:25:56 +0100 Subject: [PATCH] Fix clippy issues on nightly This fixes issues found by `clippy 0.1.95 (f134bbc78d 2026-01-24)`. --- asyncgit/src/revlog.rs | 2 +- asyncgit/src/sync/tags.rs | 2 +- src/input.rs | 2 +- src/popups/branchlist.rs | 3 +-- src/popups/reset.rs | 2 +- src/popups/taglist.rs | 3 +-- src/tabs/status.rs | 2 +- 7 files changed, 7 insertions(+), 9 deletions(-) diff --git a/asyncgit/src/revlog.rs b/asyncgit/src/revlog.rs index f738830a6e..774d5140ef 100644 --- a/asyncgit/src/revlog.rs +++ b/asyncgit/src/revlog.rs @@ -49,7 +49,7 @@ pub struct AsyncLog { static LIMIT_COUNT: usize = 3000; static SLEEP_FOREGROUND: Duration = Duration::from_millis(2); -static SLEEP_BACKGROUND: Duration = Duration::from_millis(1000); +static SLEEP_BACKGROUND: Duration = Duration::from_secs(1); impl AsyncLog { /// diff --git a/asyncgit/src/sync/tags.rs b/asyncgit/src/sync/tags.rs index f8c275ada0..7630b6dc90 100644 --- a/asyncgit/src/sync/tags.rs +++ b/asyncgit/src/sync/tags.rs @@ -141,7 +141,7 @@ pub fn get_tags_with_metadata( }) .collect(); - tags.sort_unstable_by(|a, b| b.time.cmp(&a.time)); + tags.sort_unstable_by_key(|b| std::cmp::Reverse(b.time)); Ok(tags) } diff --git a/src/input.rs b/src/input.rs index 701b8b5ac8..cfcb8ee86e 100644 --- a/src/input.rs +++ b/src/input.rs @@ -12,7 +12,7 @@ use std::{ }; static FAST_POLL_DURATION: Duration = Duration::from_millis(100); -static SLOW_POLL_DURATION: Duration = Duration::from_millis(10000); +static SLOW_POLL_DURATION: Duration = Duration::from_secs(10); /// #[derive(Clone, Copy, Debug)] diff --git a/src/popups/branchlist.rs b/src/popups/branchlist.rs index 8ef2569ce7..ab52980e9e 100644 --- a/src/popups/branchlist.rs +++ b/src/popups/branchlist.rs @@ -307,8 +307,7 @@ impl BranchListPopup { if self.visible { self.has_remotes = get_branches_info(&self.repo.borrow(), false) - .map(|branches| !branches.is_empty()) - .unwrap_or(false); + .is_ok_and(|branches| !branches.is_empty()); } } diff --git a/src/popups/reset.rs b/src/popups/reset.rs index e3c9865d56..e0c017bc10 100644 --- a/src/popups/reset.rs +++ b/src/popups/reset.rs @@ -120,7 +120,7 @@ impl ResetPopup { /// #[allow(clippy::unnecessary_wraps)] pub fn update(&mut self) -> Result<()> { - self.git_branch_name.lookup().map(Some).unwrap_or(None); + self.git_branch_name.lookup().ok(); Ok(()) } diff --git a/src/popups/taglist.rs b/src/popups/taglist.rs index 8b7ed2c590..959251b2c0 100644 --- a/src/popups/taglist.rs +++ b/src/popups/taglist.rs @@ -312,8 +312,7 @@ impl TagListPopup { self.has_remotes = sync::get_branches_info(&self.repo.borrow(), false) - .map(|branches| !branches.is_empty()) - .unwrap_or(false); + .is_ok_and(|branches| !branches.is_empty()); let basic_credential = if self.has_remotes { if need_username_password(&self.repo.borrow())? { diff --git a/src/tabs/status.rs b/src/tabs/status.rs index d5e1db8c81..135cf18e4e 100644 --- a/src/tabs/status.rs +++ b/src/tabs/status.rs @@ -382,7 +382,7 @@ impl Status { /// pub fn update(&mut self) -> Result<()> { - self.git_branch_name.lookup().map(Some).unwrap_or(None); + let _ = self.git_branch_name.lookup().ok(); if self.is_visible() { let config =