From f541b82a9da5aba547ebb8702694c62fc104ab69 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Wed, 22 Apr 2026 09:31:42 +0000 Subject: [PATCH 1/3] [create-pull-request] automated change --- rust-toolchain.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 9c823ce8..a30318a0 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.94.0" +channel = "1.95.0" components = ["rustfmt", "clippy", "rust-analyzer"] From 00eed90fe8a7d975b6ec2709122b95039deb6320 Mon Sep 17 00:00:00 2001 From: Henrik Friedrichsen Date: Fri, 22 May 2026 22:34:55 +0200 Subject: [PATCH 2/3] refactor(queue): Simplify indexed insertion --- src/queue.rs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/queue.rs b/src/queue.rs index c3718701..b99d846f 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -174,10 +174,8 @@ impl Queue { None => q.len(), }; - let mut i = first; - for track in tracks { + for (i, track) in (first..).zip(tracks.iter()) { q.insert(i, track.clone()); - i += 1; } first From 7faab73c214d65c833e8d9b9dd2d22ffbe61c8b2 Mon Sep 17 00:00:00 2001 From: Henrik Friedrichsen Date: Fri, 22 May 2026 22:38:44 +0200 Subject: [PATCH 3/3] refactor: Fix clippy errors --- src/model/episode.rs | 2 +- src/model/show.rs | 2 +- src/model/track.rs | 2 +- src/mpris.rs | 6 +++--- src/queue.rs | 8 +++++--- 5 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/model/episode.rs b/src/model/episode.rs index fac4564f..7a54c972 100644 --- a/src/model/episode.rs +++ b/src/model/episode.rs @@ -83,7 +83,7 @@ impl ListItem for Episode { } fn play(&mut self, queue: &Queue) { - let index = queue.append_next(&vec![Playable::Episode(self.clone())]); + let index = queue.append_next(&[Playable::Episode(self.clone())]); queue.play(index, true, false); } diff --git a/src/model/show.rs b/src/model/show.rs index 3855bef0..b0cb3bda 100644 --- a/src/model/show.rs +++ b/src/model/show.rs @@ -99,7 +99,7 @@ impl ListItem for Show { .unwrap_or(&Vec::new()) .iter() .map(|ep| Playable::Episode(ep.clone())) - .collect(); + .collect::>(); let index = queue.append_next(&playables); queue.play(index, true, true); diff --git a/src/model/track.rs b/src/model/track.rs index 66dfde79..805758cc 100644 --- a/src/model/track.rs +++ b/src/model/track.rs @@ -235,7 +235,7 @@ impl ListItem for Track { } fn play(&mut self, queue: &Queue) { - let index = queue.append_next(&vec![Playable::Track(self.clone())]); + let index = queue.append_next(&[Playable::Track(self.clone())]); queue.play(index, true, false); } diff --git a/src/mpris.rs b/src/mpris.rs index 321c714b..683c4515 100644 --- a/src/mpris.rs +++ b/src/mpris.rs @@ -401,7 +401,7 @@ impl MprisPlayer { let index = self.queue.append_next( &t.iter() .map(|track| Playable::Track(track.clone())) - .collect(), + .collect::>(), ); self.queue.play(index, should_shuffle, should_shuffle) } @@ -438,7 +438,7 @@ impl MprisPlayer { let index = self.queue.append_next( &ep.iter() .map(|episode| Playable::Episode(episode.clone())) - .collect(), + .collect::>(), ); self.queue.play(index, should_shuffle, should_shuffle) } @@ -458,7 +458,7 @@ impl MprisPlayer { let index = self.queue.append_next( &a.iter() .map(|track| Playable::Track(track.clone())) - .collect(), + .collect::>(), ); self.queue.play(index, should_shuffle, should_shuffle) } diff --git a/src/queue.rs b/src/queue.rs index b99d846f..4bb31b00 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -159,7 +159,7 @@ impl Queue { /// Append `tracks` after the currently playing item, taking into account /// shuffle status. Returns the first index(in `self.queue`) of added items. - pub fn append_next(&self, tracks: &Vec) -> usize { + pub fn append_next(&self, tracks: &[Playable]) -> usize { let mut q = self.queue.write().unwrap(); { @@ -508,6 +508,8 @@ pub fn send_notification(summary_txt: &str, body_txt: &str, cover_url: Option log::error!("Failed to send notification cover: {e}"), } @@ -687,7 +689,7 @@ mod tests { fn test_append_next_inserts_after_current() { // [0, 1, 2], current=1 → append_next([3, 4]) → [0, 1, 3, 4, 2] let q = make_queue(vec![make_track(0), make_track(1), make_track(2)], Some(1)); - let first = q.append_next(&vec![make_track(3), make_track(4)]); + let first = q.append_next(&[make_track(3), make_track(4)]); assert_eq!(first, 2); let queue = q.queue.read().unwrap(); let ids: Vec<&str> = queue.iter().map(track_id).collect(); @@ -697,7 +699,7 @@ mod tests { #[test] fn test_append_next_no_current_appends_at_end() { let q = make_queue(vec![make_track(0), make_track(1)], None); - let first = q.append_next(&vec![make_track(2)]); + let first = q.append_next(&[make_track(2)]); assert_eq!(first, 2); assert_eq!(q.len(), 3); }