From 5d598e29bdfcd611cd1e5e7ed69d3b64278d4e0a Mon Sep 17 00:00:00 2001 From: Henrik Friedrichsen Date: Fri, 11 Apr 2025 10:09:03 +0200 Subject: [PATCH] chore: `cargo clippy --fix` --- src/queue.rs | 6 +++--- src/ui/layout.rs | 4 ++-- src/utils.rs | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/queue.rs b/src/queue.rs index 7470c13..964ca8b 100644 --- a/src/queue.rs +++ b/src/queue.rs @@ -188,7 +188,7 @@ impl Queue { pub fn remove(&self, index: usize) { { let mut q = self.queue.write().unwrap(); - if q.len() == 0 { + if q.is_empty() { info!("queue is empty"); return; } @@ -365,7 +365,7 @@ impl Queue { if repeat == RepeatSetting::RepeatTrack && manual { self.set_repeat(RepeatSetting::RepeatPlaylist); } - } else if repeat == RepeatSetting::RepeatPlaylist && q.len() > 0 { + } else if repeat == RepeatSetting::RepeatPlaylist && !q.is_empty() { let random_order = self.random_order.read().unwrap(); self.play( random_order.as_ref().map(|o| o[0]).unwrap_or(0), @@ -385,7 +385,7 @@ impl Queue { if let Some(index) = self.previous_index() { self.play(index, false, false); - } else if repeat == RepeatSetting::RepeatPlaylist && q.len() > 0 { + } else if repeat == RepeatSetting::RepeatPlaylist && !q.is_empty() { if self.get_shuffle() { let random_order = self.random_order.read().unwrap(); self.play( diff --git a/src/ui/layout.rs b/src/ui/layout.rs index 417c2f9..b07a22e 100644 --- a/src/ui/layout.rs +++ b/src/ui/layout.rs @@ -267,7 +267,7 @@ impl View for Layout { fn draw(&self, printer: &Printer<'_, '_>) { let result = self.get_result(); - let cmdline_visible = self.cmdline.get_content().len() > 0; + let cmdline_visible = !self.cmdline.get_content().is_empty(); let mut cmdline_height = usize::from(cmdline_visible); if result.as_ref().map(Option::is_some).unwrap_or(true) { cmdline_height += 1; @@ -411,7 +411,7 @@ impl View for Layout { let result = self.get_result(); - let cmdline_visible = self.cmdline.get_content().len() > 0; + let cmdline_visible = !self.cmdline.get_content().is_empty(); let mut cmdline_height = usize::from(cmdline_visible); if result.as_ref().map(Option::is_some).unwrap_or(true) { cmdline_height += 1; diff --git a/src/utils.rs b/src/utils.rs index 595c1d9..b766fa4 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -45,7 +45,7 @@ pub fn ms_to_hms(duration: u32) -> String { pub fn cache_path_for_url(url: String) -> std::path::PathBuf { let mut path = crate::config::cache_path("covers"); - path.push(url.split('/').last().unwrap()); + path.push(url.split('/').next_back().unwrap()); path }