diff --git a/src/debug_log.rs b/src/debug_log.rs index 1a791a8..1b151c2 100644 --- a/src/debug_log.rs +++ b/src/debug_log.rs @@ -46,26 +46,26 @@ pub fn log_error(msg: T) where T: Display, { - println!("Error: {}", msg); + println!("Error: {msg}"); } pub fn log_warning(msg: T) where T: Display, { - println!("Warning: {}", msg); + println!("Warning: {msg}"); } pub fn log_debug(msg: T) where T: Display, { - println!("Debug: {}", msg); + println!("Debug: {msg}"); } pub fn log_verbose(msg: T) where T: Display, { - println!("Verbose: {}", msg); + println!("Verbose: {msg}"); } diff --git a/src/display.rs b/src/display.rs index 7c30c2c..974317c 100644 --- a/src/display.rs +++ b/src/display.rs @@ -112,7 +112,7 @@ fn string_to_text( } } else { log( - format!("Failed to find font for {}", c), + format!("Failed to find font for {c}"), debug_log::LogState::Error, debug_log::LogLevel::Error, ); @@ -234,7 +234,7 @@ impl MPDDisplay { is_initialized: false, is_authenticated: false, notice_text: Text::default(), - poll_instant: Instant::now() - POLL_TIME, + poll_instant: Instant::now().checked_sub(POLL_TIME).unwrap(), shared: None, password_entered: false, dirty_flag: None, @@ -411,13 +411,10 @@ impl MPDDisplay { let reader = ImageReader::new(Cursor::new(image_ref)); let guessed_reader = reader .with_guessed_format() - .map_err(|e| format!("Error: Failed to guess format of album art image: {}", e)); + .map_err(|e| format!("Error: Failed to guess format of album art image: {e}")); if let Ok(reader) = guessed_reader { reader.decode().map_err(|e| { - format!( - "Error: Failed to decode album art image (guessed format): {}", - e - ) + format!("Error: Failed to decode album art image (guessed format): {e}") }) } else { // Convert Ok(_) to Ok(DynamicImage) which will never be used @@ -427,7 +424,7 @@ impl MPDDisplay { } else { ImageReader::with_format(Cursor::new(image_ref), image_format) .decode() - .map_err(|e| format!("Error: Failed to decode album art image: {}", e)) + .map_err(|e| format!("Error: Failed to decode album art image: {e}")) }; if img_result.is_err() && !self.tried_album_art_in_dir { return try_second_art_fetch_method( @@ -732,8 +729,7 @@ impl EventHandler for MPDDisplay { if !self.is_valid { if let Err(mpd_handler_error) = &self.mpd_handler { return Err(GameError::EventLoopError(format!( - "Failed to initialize MPDHandler: {}", - mpd_handler_error + "Failed to initialize MPDHandler: {mpd_handler_error}" ))); } else { return Err(GameError::EventLoopError( diff --git a/src/main.rs b/src/main.rs index 07c60dc..7018214 100644 --- a/src/main.rs +++ b/src/main.rs @@ -131,7 +131,7 @@ fn main() -> Result<(), String> { display.text_input_event(ctx, ch).ok(); } x => log( - format!("Other window event fired: {:?}", x), + format!("Other window event fired: {x:?}"), debug_log::LogState::Verbose, opt.log_level, ), @@ -162,7 +162,7 @@ fn main() -> Result<(), String> { ggez::timer::yield_now(); } x => log( - format!("Device event fired: {:?}", x), + format!("Device event fired: {x:?}"), debug_log::LogState::Verbose, opt.log_level, ), diff --git a/src/mpd_handler.rs b/src/mpd_handler.rs index 36b2663..b93226c 100644 --- a/src/mpd_handler.rs +++ b/src/mpd_handler.rs @@ -274,9 +274,9 @@ impl MPDHandler { did_check_overtime: false, force_get_status: false, force_get_current_song: false, - song_title_get_time: Instant::now() - Duration::from_secs(10), - song_pos_get_time: Instant::now() - Duration::from_secs(10), - song_length_get_time: Instant::now() - Duration::from_secs(10), + song_title_get_time: Instant::now().checked_sub(Duration::from_secs(10)).unwrap(), + song_pos_get_time: Instant::now().checked_sub(Duration::from_secs(10)).unwrap(), + song_length_get_time: Instant::now().checked_sub(Duration::from_secs(10)).unwrap(), self_thread: None, dirty_flag: Arc::new(AtomicBool::new(true)), stop_flag: Arc::new(AtomicBool::new(false)), @@ -426,13 +426,13 @@ impl MPDHandler { if let Err(err_string) = self.handler_read_block(&mut buf, &mut saved, &mut saved_str) { log( - format!("read_block error: {}", err_string), + format!("read_block error: {err_string}"), LogState::Warning, log_level, ); } else if let Err(err_string) = self.handler_write_block() { log( - format!("write_block error: {}", err_string), + format!("write_block error: {err_string}"), LogState::Warning, log_level, ); @@ -477,7 +477,7 @@ impl MPDHandler { let read_result = write_handle.stream.read(buf); if let Err(io_err) = read_result { if io_err.kind() != io::ErrorKind::WouldBlock { - return Err(format!("TCP stream error: {}", io_err)); + return Err(format!("TCP stream error: {io_err}")); } else { return Ok(()); } @@ -649,9 +649,9 @@ impl MPDHandler { MPDPlayState::Paused }; write_handle.error_text.clear(); - write!(&mut write_handle.error_text, "MPD has {:?}", got_mpd_state).ok(); + write!(&mut write_handle.error_text, "MPD has {got_mpd_state:?}").ok(); log( - format!("MPD is {:?}", got_mpd_state), + format!("MPD is {got_mpd_state:?}"), LogState::Warning, write_handle.log_level, ); @@ -736,7 +736,7 @@ impl MPDHandler { write_handle.art_data_type = line.split_off(6); } else { log( - format!("Got unrecognized/ignored line: {}", line), + format!("Got unrecognized/ignored line: {line}"), LogState::Warning, write_handle.log_level, ); @@ -799,12 +799,12 @@ impl MPDHandler { let p = write_handle.password.clone(); let write_result = write_handle .stream - .write(format!("password {}\n", p).as_bytes()); + .write(format!("password {p}\n").as_bytes()); if write_result.is_ok() { write_handle.poll_state = PollState::Password; } else if let Err(e) = write_result { log( - format!("Failed to send password for authentication: {}", e), + format!("Failed to send password for authentication: {e}"), LogState::Error, write_handle.log_level, ); @@ -820,7 +820,7 @@ impl MPDHandler { write_handle.poll_state = PollState::CurrentSong; } else if let Err(e) = write_result { log( - format!("Failed to request song info over stream: {}", e), + format!("Failed to request song info over stream: {e}"), LogState::Error, write_handle.log_level, ); @@ -836,7 +836,7 @@ impl MPDHandler { write_handle.poll_state = PollState::Status; } else if let Err(e) = write_result { log( - format!("Failed to request status over stream: {}", e), + format!("Failed to request status over stream: {e}"), LogState::Error, write_handle.log_level, ); @@ -848,14 +848,14 @@ impl MPDHandler { let title = write_handle.current_song_filename.clone(); let art_data_length = write_handle.art_data.len(); if write_handle.can_get_album_art { - let write_result = write_handle.stream.write( - format!("readpicture \"{}\" {}\n", title, art_data_length).as_bytes(), - ); + let write_result = write_handle + .stream + .write(format!("readpicture \"{title}\" {art_data_length}\n").as_bytes()); if write_result.is_ok() { write_handle.poll_state = PollState::ReadPicture; } else if let Err(e) = write_result { log( - format!("Failed to request album art: {}", e), + format!("Failed to request album art: {e}"), LogState::Error, write_handle.log_level, ); @@ -863,12 +863,12 @@ impl MPDHandler { } else if write_handle.can_get_album_art_in_dir { let write_result = write_handle .stream - .write(format!("albumart \"{}\" {}\n", title, art_data_length).as_bytes()); + .write(format!("albumart \"{title}\" {art_data_length}\n").as_bytes()); if write_result.is_ok() { write_handle.poll_state = PollState::ReadPictureInDir; } else if let Err(e) = write_result { log( - format!("Failed to request album art in dir: {}", e), + format!("Failed to request album art in dir: {e}"), LogState::Error, write_handle.log_level, ); diff --git a/src/unicode_support/fontconfig.rs b/src/unicode_support/fontconfig.rs index d1e8037..8b43631 100644 --- a/src/unicode_support/fontconfig.rs +++ b/src/unicode_support/fontconfig.rs @@ -67,8 +67,7 @@ mod ffi { return Err(String::from("Failed to FcFontMatch (FcResult is not FcResultMatch; result_pattern is not null)")); } else { return Err(format!( - "Failed to FcFontMatch (FcResult is not FcResultMatch; {:?})", - result + "Failed to FcFontMatch (FcResult is not FcResultMatch; {result:?})" )); } } else if result_pattern.is_null() {