diff --git a/src/discord_client/music_brainz.rs b/src/discord_client/music_brainz.rs index 0139c57..6bdc1d6 100644 --- a/src/discord_client/music_brainz.rs +++ b/src/discord_client/music_brainz.rs @@ -17,7 +17,7 @@ fn get_track_cover_art(artist: &Option, title: &Option) -> Optio if let Some(ref artist) = artist { // Some artist fields might contain + characters // Pointing at multiple artists - for part in artist.split("+") { + for part in artist.split('+') { builder.and().artist(part); } } @@ -33,7 +33,7 @@ fn get_album_cover_art(album_artist: &Option, album: &Option) - if let Some(ref album_artist) = album_artist { // Some artist fields might contain + characters // Pointing at multiple artists - for part in album_artist.split("+") { + for part in album_artist.split('+') { builder.and().artist(part); } } diff --git a/src/lib.rs b/src/lib.rs index a4e740f..6b12f96 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -22,5 +22,5 @@ fn mpv_open_cplugin(handle: *mut mpv_handle) -> std::os::raw::c_int { }; plugin.run(); - return 0; + 0 } diff --git a/src/logging.rs b/src/logging.rs index 57f982f..a277412 100644 --- a/src/logging.rs +++ b/src/logging.rs @@ -49,19 +49,19 @@ impl Logger { pub fn info(&self, message: &str) { if self.log_level >= LogLevel::Info { - println!("[mpv-rpc (INFO)] {}", message); + println!("[mpv-rpc (INFO)] {message}"); } } pub fn warning(&self, message: &str) { if self.log_level >= LogLevel::Warn { - println!("[mpv-rpc (WARN)] {}", message); + println!("[mpv-rpc (WARN)] {message}"); } } pub fn error(&self, message: &str) { if self.log_level >= LogLevel::Error { - println!("[mpv-rpc (ERROR)] {}", message); + println!("[mpv-rpc (ERROR)] {message}"); } } } diff --git a/src/mpv_event_queue.rs b/src/mpv_event_queue.rs index c1d8b86..76ff067 100644 --- a/src/mpv_event_queue.rs +++ b/src/mpv_event_queue.rs @@ -25,7 +25,7 @@ impl MpvEventQueue { Ok(new_self) } - pub fn from_ptr<'a>(handle: *mut mpv_handle, logger: Rc) -> Result { + pub fn from_ptr(handle: *mut mpv_handle, logger: Rc) -> Result { MpvEventQueue::new(Handle::from_ptr(handle), logger) } @@ -42,8 +42,7 @@ impl MpvEventQueue { pub fn next_event(&mut self) -> Option { let event = self.mpv.wait_event(-1.0); - let mpv_event = self.convert_event(event); - mpv_event + self.convert_event(event) } pub fn handle_request(&self, request: MpvRequest) -> Result<(), &'static str> { diff --git a/src/mpv_event_queue/events.rs b/src/mpv_event_queue/events.rs index f88f07e..8338eba 100644 --- a/src/mpv_event_queue/events.rs +++ b/src/mpv_event_queue/events.rs @@ -30,5 +30,5 @@ pub trait MpvEventHandler { } pub trait MpvRequester { - fn next_request<'a>(&mut self) -> Option; + fn next_request(&mut self) -> Option; } diff --git a/src/plugin.rs b/src/plugin.rs index 45d8f7c..89695ed 100644 --- a/src/plugin.rs +++ b/src/plugin.rs @@ -48,10 +48,7 @@ impl RPCPlugin { } fn handle_event(&mut self, event: MpvEvent) -> bool { - let exit = match event { - MpvEvent::Exit => true, - _ => false - }; + let exit = matches!(event, MpvEvent::Exit); if let Err(e) = self.discord.handle_event(event) { logging::error!(self.logger, "Failed to handle event: {e}");