From 76b477dafc6dafe3ed1dc69ba6d5b2326214571d Mon Sep 17 00:00:00 2001 From: Miel Peeters Date: Thu, 14 May 2026 16:35:46 +0200 Subject: [PATCH 1/4] fix: clippy collapse match warning the CI workflow fails because of a clippy::collapsible-match warning. This is clippy's suggested change. --- lyric_finder/src/lib.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lyric_finder/src/lib.rs b/lyric_finder/src/lib.rs index c6000ce9..4d6fde2c 100644 --- a/lyric_finder/src/lib.rs +++ b/lyric_finder/src/lib.rs @@ -249,10 +249,8 @@ mod parse { } match &node.data { - NodeData::Text { contents } => { - if should_parse { - s.push_str(&contents.borrow().to_string()); - } + NodeData::Text { contents } if should_parse => { + s.push_str(&contents.borrow().to_string()); } NodeData::Element { ref name, .. } => { if let expanded_name!(html "br") = name.expanded() { From c816c9ea206811be996ad2b29329a0d18bd2207a Mon Sep 17 00:00:00 2001 From: Miel Peeters Date: Thu, 14 May 2026 16:53:57 +0200 Subject: [PATCH 2/4] fix: clippy Duration construction warnings --- spotify_player/src/media_control.rs | 2 +- spotify_player/src/state/data.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spotify_player/src/media_control.rs b/spotify_player/src/media_control.rs index 0fb158db..9b443278 100644 --- a/spotify_player/src/media_control.rs +++ b/spotify_player/src/media_control.rs @@ -142,7 +142,7 @@ pub fn start_event_watcher( // The below refresh duration should be no less than 1s to avoid **overloading** linux dbus // handler provided by the souvlaki library, which only handles an event every 1s. // [1]: https://github.com/Sinono3/souvlaki/blob/b4d47bb2797ffdd625c17192df640510466762e1/src/platform/linux/mod.rs#L450 - let refresh_duration = std::time::Duration::from_millis(1000); + let refresh_duration = std::time::Duration::from_secs(1); let mut info = String::new(); loop { update_control_metadata(state, &mut controls, &mut info)?; diff --git a/spotify_player/src/state/data.rs b/spotify_player/src/state/data.rs index 9bf773a0..d0e9f11b 100644 --- a/spotify_player/src/state/data.rs +++ b/spotify_player/src/state/data.rs @@ -24,7 +24,7 @@ pub enum FileCacheKey { /// default time-to-live cache duration pub static TTL_CACHE_DURATION: LazyLock = - LazyLock::new(|| std::time::Duration::from_secs(60 * 60)); + LazyLock::new(|| std::time::Duration::from_hours(1)); /// the application's data pub struct AppData { From ba4703a55221deae8bebf812723fba9e80c04188 Mon Sep 17 00:00:00 2001 From: Miel Peeters Date: Thu, 14 May 2026 16:54:06 +0200 Subject: [PATCH 3/4] fix: clippy collapsible match warning --- spotify_player/src/event/popup.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/spotify_player/src/event/popup.rs b/spotify_player/src/event/popup.rs index 55540785..3b2bee84 100644 --- a/spotify_player/src/event/popup.rs +++ b/spotify_player/src/event/popup.rs @@ -27,6 +27,8 @@ pub fn handle_key_sequence_for_popup( ui, ); } + // can't use match guard: the match holds an immutable borrow of ui + #[allow(clippy::collapsible_match)] PopupState::UserPlaylistList(..) => { if handle_key_sequence_for_playlist_search_popup(key_sequence, ui) { return Ok(true); From 4dfa54533e1853c24f4f06d8c4d3ace96a02f8a4 Mon Sep 17 00:00:00 2001 From: Miel Peeters Date: Thu, 14 May 2026 16:54:38 +0200 Subject: [PATCH 4/4] fix: clippy prefers sort_by_key --- spotify_player/src/event/page.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spotify_player/src/event/page.rs b/spotify_player/src/event/page.rs index e1396ded..1bcfb0f2 100644 --- a/spotify_player/src/event/page.rs +++ b/spotify_player/src/event/page.rs @@ -121,12 +121,12 @@ fn handle_command_for_library_page( // Sort albums alphabetically data.user_data .saved_albums - .sort_by(|x, y| x.name.to_lowercase().cmp(&y.name.to_lowercase())); + .sort_by_key(|x| x.name.to_lowercase()); // Sort artists alphabetically data.user_data .followed_artists - .sort_by(|x, y| x.name.to_lowercase().cmp(&y.name.to_lowercase())); + .sort_by_key(|x| x.name.to_lowercase()); } if command == Command::SortLibraryByRecent { @@ -155,7 +155,7 @@ fn handle_command_for_library_page( // Sort albums by recent addition data.user_data .saved_albums - .sort_by(|a, b| b.added_at.cmp(&a.added_at)); + .sort_by_key(|a| std::cmp::Reverse(a.added_at)); } match focus_state {