Fixed clippy warnings for rust 1.88.0

Author: spirali

crates/hyperqueue/src/bin/hq.rs

@@ -376,12 +376,11 @@ fn hq_panic_hook(_info: &PanicHookInfo) {
 If you would be so kind, please report this issue at the HQ issue tracker: https://github.com/It4innovations/hyperqueue/issues/new?title=HQ%20crashes
 Please include the above error (starting from "thread ... panicked ...") and the stack backtrace in the issue contents, along with the following information:
 
-HyperQueue version: {version}
+HyperQueue version: {HQ_VERSION}
 
 You can also re-run HyperQueue server (and its workers) with the `RUST_LOG=hq=debug,tako=debug`
 environment variable, and attach the logs to the issue, to provide us more information.
-"#,
-        version = HQ_VERSION
+"#
     );
 
     if io::stdout().is_terminal() {

crates/hyperqueue/src/client/commands/job.rs

@@ -267,16 +267,13 @@ pub async fn cancel_job(
                 )
             }
             CancelJobResponse::Canceled(_, _) => {
-                log::error!(
-                    "Canceling job {} failed; all tasks are already finished",
-                    job_id
-                )
+                log::error!("Canceling job {job_id} failed; all tasks are already finished")
             }
             CancelJobResponse::InvalidJob => {
-                log::error!("Canceling job {} failed; job not found", job_id)
+                log::error!("Canceling job {job_id} failed; job not found")
             }
             CancelJobResponse::Failed(msg) => {
-                log::error!("Canceling job {} failed; {}", job_id, msg)
+                log::error!("Canceling job {job_id} failed; {msg}")
             }
         }
     }
@@ -302,13 +299,13 @@ pub async fn close_job(
     for (job_id, response) in responses {
         match response {
             CloseJobResponse::Closed => {
-                log::info!("Job {} closed", job_id)
+                log::info!("Job {job_id} closed")
             }
             CloseJobResponse::InvalidJob => {
-                log::error!("Closing job {} failed; job not found", job_id)
+                log::error!("Closing job {job_id} failed; job not found")
             }
             CloseJobResponse::AlreadyClosed => {
-                log::error!("Closing job {} failed; job is already closed", job_id)
+                log::error!("Closing job {job_id} failed; job is already closed")
             }
         }
     }

crates/hyperqueue/src/client/commands/submit/command.rs

@@ -875,11 +875,8 @@ fn warn_missing_task_id(opts: &JobSubmitOpts, task_count: u32) {
             let path_has_cwd = placeholders.contains(&StringPart::Placeholder(CWD_PLACEHOLDER));
             if !path_has_task_id && (!path_has_cwd || !cwd_has_task_id) {
                 log::warn!(
-                    "You have submitted an array job, but the `{}` path does not contain the task ID placeholder.\n\
-        Individual tasks might thus overwrite the file. Consider adding `%{{{}}}` to the `--{}` value.",
-                    stream,
-                    TASK_ID_PLACEHOLDER,
-                    stream
+                    "You have submitted an array job, but the `{stream}` path does not contain the task ID placeholder.\n\
+        Individual tasks might thus overwrite the file. Consider adding `%{{{TASK_ID_PLACEHOLDER}}}` to the `--{stream}` value."
                 );
             }
         }

crates/hyperqueue/src/client/commands/submit/directives.rs

@@ -121,7 +121,7 @@ pub fn parse_hq_directives(
 
     // clap parses first argument as name of the program
     arguments.insert(0, "".to_string());
-    log::debug!("Applying directive(s): {:?}", arguments);
+    log::debug!("Applying directive(s): {arguments:?}");
 
     let app = SubmitJobTaskConfOpts::command()
         .disable_help_flag(true)

crates/hyperqueue/src/client/commands/worker.rs

@@ -428,16 +428,16 @@ pub async fn stop_worker(session: &mut ClientSession, selector: IdSelector) -> c
     for (id, response) in responses {
         match response {
             StopWorkerResponse::Failed(e) => {
-                log::error!("Stopping worker {} failed; {}", id, e);
+                log::error!("Stopping worker {id} failed; {e}");
             }
             StopWorkerResponse::InvalidWorker => {
-                log::error!("Stopping worker {} failed; worker not found", id);
+                log::error!("Stopping worker {id} failed; worker not found");
             }
             StopWorkerResponse::AlreadyStopped => {
-                log::warn!("Stopping worker {} failed; worker is already stopped", id);
+                log::warn!("Stopping worker {id} failed; worker is already stopped");
             }
             StopWorkerResponse::Stopped => {
-                log::info!("Worker {} stopped", id)
+                log::info!("Worker {id} stopped")
             }
         }
     }

crates/hyperqueue/src/client/output/cli.rs

@@ -96,7 +96,7 @@ impl CliOutput {
     fn print_table(&self, table: TableStruct) {
         let table = table.color_choice(self.color_policy);
         if let Err(e) = print_stdout(table) {
-            log::error!("Cannot print table to stdout: {:?}", e);
+            log::error!("Cannot print table to stdout: {e:?}");
         }
     }
 
@@ -380,9 +380,9 @@ impl Output for CliOutput {
                     assigned_tasks,
                     is_reserved,
                 } => {
-                    write!(s, "assigned tasks: {}", assigned_tasks).unwrap();
+                    write!(s, "assigned tasks: {assigned_tasks}").unwrap();
                     if running_tasks > 0 {
-                        write!(s, "; running tasks: {}", running_tasks).unwrap();
+                        write!(s, "; running tasks: {running_tasks}").unwrap();
                     }
                     if is_reserved {
                         write!(s, "; reserved for a multi-node task").unwrap();
@@ -467,7 +467,7 @@ impl Output for CliOutput {
             println!("{}", job_task_ids[0].1);
         } else {
             for (job_id, array) in &job_task_ids {
-                println!("{}: {}", job_id, array);
+                println!("{job_id}: {array}");
             }
         }
     }
@@ -1367,10 +1367,7 @@ pub fn print_job_output(
                 Err(error) => log::warn!("File `{path}` cannot be opened: {error:?}"),
             };
         } else {
-            log::warn!(
-                "Task {} has no `{stream_name}` stream associated with it",
-                task_id
-            );
+            log::warn!("Task {task_id} has no `{stream_name}` stream associated with it");
         }
     };
 
@@ -1605,9 +1602,9 @@ fn format_descriptor_kind(kind: &ResourceDescriptorKind) -> String {
                 )
             )
         }
-        ResourceDescriptorKind::Range { start, end } if start == end => format!("[{}]", start),
-        ResourceDescriptorKind::Range { start, end } => format!("range({}-{})", start, end),
-        ResourceDescriptorKind::Sum { size } => format!("sum({})", size),
+        ResourceDescriptorKind::Range { start, end } if start == end => format!("[{start}]"),
+        ResourceDescriptorKind::Range { start, end } => format!("range({start}-{end})"),
+        ResourceDescriptorKind::Sum { size } => format!("sum({size})"),
     }
 }
 
@@ -1702,16 +1699,16 @@ fn explanation_item_to_strings(
             worker_amount,
         } => (
             resource.color(colored::Color::Cyan),
-            format!("{}", worker_amount).color(colored::Color::Yellow),
-            format!("{}", request_amount).color(request_color),
+            format!("{worker_amount}").color(colored::Color::Yellow),
+            format!("{request_amount}").color(request_color),
         ),
         TaskExplainItem::WorkerGroup {
             n_nodes,
             group_size,
         } => (
             "nodes".color(colored::Color::Magenta),
-            format!("group size {}", group_size).color(colored::Color::Yellow),
-            format!("{}", n_nodes).color(request_color),
+            format!("group size {group_size}").color(colored::Color::Yellow),
+            format!("{n_nodes}").color(request_color),
         ),
     }
 }

crates/hyperqueue/src/client/output/quiet.rs

@@ -72,7 +72,7 @@ impl Output for Quiet {
     }
 
     fn print_job_open(&self, job_id: JobId) {
-        println!("{}", job_id);
+        println!("{job_id}");
     }
 
     fn print_job_list(&self, jobs: Vec<JobInfo>, _total_jobs: usize) {

crates/hyperqueue/src/common/format.rs

@@ -30,7 +30,7 @@ pub fn human_size(size: u64) -> String {
 pub fn human_mem_amount(amount: ResourceAmount) -> String {
     let f = amount.as_f32();
     if f < 512f32 {
-        format!("{:.2} MiB", f)
+        format!("{f:.2} MiB")
     } else {
         format!("{:.2} GiB", f / 1024.0)
     }

crates/hyperqueue/src/dashboard/ui/screens/root_screen.rs

@@ -254,7 +254,7 @@ fn render_timeline(data: &DashboardData, rect: Rect, frame: &mut Frame) {
 
     let offset = offset_duration(data).as_secs();
     let offset = if offset < 60 {
-        format!("{}s", offset)
+        format!("{offset}s")
     } else {
         format!("{}m", offset / 60)
     };

crates/hyperqueue/src/server/autoalloc/process.rs

@@ -705,8 +705,8 @@ not be removed. Use `--force` if you want to remove the queue anyway"
 
     for (result, allocation_id) in futures::future::join_all(remove_alloc_fut).await {
         match result {
-            Ok(_) => log::info!("Allocation {} was removed", allocation_id),
-            Err(e) => log::error!("Failed to remove allocation {}: {:?}", allocation_id, e),
+            Ok(_) => log::info!("Allocation {allocation_id} was removed"),
+            Err(e) => log::error!("Failed to remove allocation {allocation_id}: {e:?}"),
         }
     }