Fix new warnings

Author: 2e3s

watchers/src/report_client.rs

@@ -48,7 +48,7 @@ impl ReportClient {
                     if e.to_string()
                         .contains("tcp connect error: Connection refused") =>
                 {
-                    warn!("Failed to connect on attempt #{attempt}, retrying: {}", e);
+                    warn!("Failed to connect on attempt #{attempt}, retrying: {e}");
 
                     tokio::time::sleep(tokio::time::Duration::from_secs(secs)).await;
                 }
@@ -107,11 +107,7 @@ impl ReportClient {
         let mut data = Map::new();
 
         if let Some((inserted_app_id, inserted_title)) = self.get_filtered_data(app_id, title) {
-            trace!(
-                "Reporting app_id: {}, title: {}",
-                inserted_app_id,
-                inserted_title
-            );
+            trace!("Reporting app_id: {inserted_app_id}, title: {inserted_title}");
 
             data.insert("app".to_string(), Value::String(inserted_app_id));
             data.insert("title".to_string(), Value::String(inserted_title));
@@ -155,13 +151,13 @@ impl ReportClient {
         match filter_result {
             FilterResult::Replace(replacement) => {
                 let app_id = if let Some(replace_app_id) = replacement.replace_app_id {
-                    trace!("Replacing app_id by {}", replace_app_id);
+                    trace!("Replacing app_id by {replace_app_id}");
                     replace_app_id
                 } else {
                     app_id.to_string()
                 };
                 let title = if let Some(replace_title) = replacement.replace_title {
-                    trace!("Replacing title by {}", replace_title);
+                    trace!("Replacing title by {replace_title}");
                     replace_title
                 } else {
                     title.to_string()

watchers/src/watchers.rs

@@ -138,7 +138,7 @@ pub async fn run_first_supported(client: Arc<ReportClient>, watcher_type: &Watch
                     error!("Error on {watcher_type} iteration: {e}");
                 }
                 Err(_) => {
-                    error!("Timeout on {watcher_type} iteration after {:?}", sleep_time);
+                    error!("Timeout on {watcher_type} iteration after {sleep_time:?}");
                 }
             }
 

watchers/src/watchers/idle.rs

@@ -258,8 +258,7 @@ mod tests {
                 assert_eq!(
                     self.diff_seconds(*last_input_time),
                     expected_last_input_seconds_ago,
-                    "{}",
-                    message
+                    "{message}"
                 );
             } else {
                 panic!("Expected active status");
@@ -283,10 +282,9 @@ mod tests {
                 assert_eq!(
                     self.diff_seconds(*last_input_time),
                     last_input_ago,
-                    "{}",
-                    message
+                    "{message}"
                 );
-                assert_eq!(duration.num_seconds(), last_input_ago, "{}", message);
+                assert_eq!(duration.num_seconds(), last_input_ago, "{message}");
             } else {
                 panic!("Expected idle status");
             }

watchers/src/watchers/wl_foreign_toplevel_management.rs

@@ -92,7 +92,7 @@ impl Dispatch<ZwlrForeignToplevelHandleV1, ()> for ToplevelState {
                     window.app_id = app_id;
                 }
                 HandleEvent::State { state } => {
-                    trace!("State is changed for {id}: {:?}", state);
+                    trace!("State is changed for {id}: {state:?}");
                     if state.contains(&(HandleState::Activated as u8)) {
                         trace!("Window is activated: {id}");
                         toplevel_state.current_window_id = Some(id);