From 87f401f5cff9d3d015df77bac249d9e5026925c4 Mon Sep 17 00:00:00 2001 From: Ryze Date: Mon, 15 Jul 2024 02:43:20 +0300 Subject: [PATCH] Make clippy happy --- src/discord_client.rs | 2 +- src/discord_client/music_brainz.rs | 2 +- src/logging.rs | 4 +++- src/mpv_event_queue.rs | 12 ++++++------ src/mpv_event_queue/events.rs | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/discord_client.rs b/src/discord_client.rs index 7385fd0..a09c866 100644 --- a/src/discord_client.rs +++ b/src/discord_client.rs @@ -265,7 +265,7 @@ impl MpvEventHandler for DiscordClient { MpvEvent::FileLoaded(file_info) => self.set_presence(file_info), MpvEvent::Seek(remaining_time) => self.set_timestamps(remaining_time), MpvEvent::Play(remaining_time) => self.set_timestamps(remaining_time), - MpvEvent::Pause(_) => self.clear_timestamps(), + MpvEvent::Pause => self.clear_timestamps(), MpvEvent::Buffering => self.clear_timestamps(), MpvEvent::Toggle => self.toggle_activity(), MpvEvent::Exit => self.close(), diff --git a/src/discord_client/music_brainz.rs b/src/discord_client/music_brainz.rs index 6bdc1d6..261ae7b 100644 --- a/src/discord_client/music_brainz.rs +++ b/src/discord_client/music_brainz.rs @@ -47,7 +47,7 @@ fn get_cover_art_from_query(query: String) -> Option { Err(_) => return None }; - let release = match result.entities.get(0) { + let release = match result.entities.first() { Some(group) => group, None => return None }; diff --git a/src/logging.rs b/src/logging.rs index a277412..e9c673d 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -1,6 +1,8 @@ use std::env; pub mod macros; + +#[allow(unused_imports)] pub use macros::{error, warning, info}; #[allow(dead_code)] @@ -40,7 +42,7 @@ impl Logger { pub fn from_env() -> Self { let level = env::var("MPV_RPC_LOG").unwrap_or_default(); let level: u32 = level.parse().unwrap_or(LogLevel::Error as u32); - + let log_level = LogLevel::from(level); Self { log_level diff --git a/src/mpv_event_queue.rs b/src/mpv_event_queue.rs index 76ff067..0062497 100644 --- a/src/mpv_event_queue.rs +++ b/src/mpv_event_queue.rs @@ -15,13 +15,13 @@ pub struct MpvEventQueue { } impl MpvEventQueue { - pub fn new(mpv: Handle,logger: Rc) -> Result { + pub fn new(mpv: Handle,logger: Rc) -> Result { let new_self = Self { mpv, logger, }; - - new_self.initialize()?; + + new_self.initialize()?; Ok(new_self) } @@ -50,7 +50,7 @@ impl MpvEventQueue { MpvRequest::OSDMessage(message) => self.display_osd_message(message) } } - + pub fn display_osd_message(&self, message: &str) -> Result<(), &'static str> { match self.mpv.osd_message(message, Duration::from_secs(1)) { Ok(()) => Ok(()), @@ -111,7 +111,7 @@ impl MpvEventQueue { let time = self.get_remaining_time(); match pause { false => Some(MpvEvent::Play(time)), - true => Some(MpvEvent::Pause(time)) + true => Some(MpvEvent::Pause) } } @@ -133,7 +133,7 @@ impl MpvEventQueue { fn get_toggle_event(&self, message: ClientMessage) -> Option { let command = message.args().join(" "); logging::info!(self.logger, "Client message: {command}"); - + if command.starts_with("key-binding toggle-rpc d-") { Some(MpvEvent::Toggle) } diff --git a/src/mpv_event_queue/events.rs b/src/mpv_event_queue/events.rs index 8338eba..8bfdd1b 100644 --- a/src/mpv_event_queue/events.rs +++ b/src/mpv_event_queue/events.rs @@ -17,7 +17,7 @@ pub enum MpvEvent { Exit, FileLoaded(FileInfo), Play(i64), - Pause(i64), + Pause, Seek(i64) }