From 7498902d4664b506b63d2ca916e6c2f06cbca03d Mon Sep 17 00:00:00 2001
From: NotAShelf <raf@notashelf.dev>
Date: Fri, 14 Nov 2025 21:47:44 +0300
Subject: [PATCH] eh: eliminated unnecessary string allocations in retry

Signed-off-by: NotAShelf <raf@notashelf.dev>
Change-Id: I50f693ec70719a2e23c7f355be3d2c446a6a6964
---
 eh/src/command.rs |  5 +++++
 eh/src/util.rs    | 20 +++++++++-----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/eh/src/command.rs b/eh/src/command.rs
index af95349..cf19869 100644
--- a/eh/src/command.rs
+++ b/eh/src/command.rs
@@ -63,6 +63,11 @@ impl NixCommand {
     self
   }
 
+  pub fn args_ref(mut self, args: &[String]) -> Self {
+    self.args.extend(args.iter().cloned());
+    self
+  }
+
   pub fn env<K: Into<String>, V: Into<String>>(
     mut self,
     key: K,
diff --git a/eh/src/util.rs b/eh/src/util.rs
index cfb6915..6f1490d 100644
--- a/eh/src/util.rs
+++ b/eh/src/util.rs
@@ -174,13 +174,11 @@ pub fn handle_nix_with_retry(
 
   // For run commands, try interactive first to avoid breaking terminal
   if subcommand == "run" && interactive {
-    let mut cmd = NixCommand::new(subcommand)
+    let status = NixCommand::new(subcommand)
       .print_build_logs(true)
-      .interactive(true);
-    for arg in args {
-      cmd = cmd.arg(arg);
-    }
-    let status = cmd.run_with_logs(StdIoInterceptor)?;
+      .interactive(true)
+      .args_ref(args)
+      .run_with_logs(StdIoInterceptor)?;
     if status.success() {
       return Ok(0);
     }
@@ -189,7 +187,7 @@ pub fn handle_nix_with_retry(
   // First, always capture output to check for errors that need retry
   let output_cmd = NixCommand::new(subcommand)
     .print_build_logs(true)
-    .args(args.iter().cloned());
+    .args_ref(args);
   let output = output_cmd.output()?;
   let stderr = String::from_utf8_lossy(&output.stderr);
 
@@ -200,7 +198,7 @@ pub fn handle_nix_with_retry(
         info!("{}", Paint::green("✔ Fixed hash mismatch, retrying..."));
         let mut retry_cmd = NixCommand::new(subcommand)
           .print_build_logs(true)
-          .args(args.iter().cloned());
+          .args_ref(args);
         if interactive {
           retry_cmd = retry_cmd.interactive(true);
         }
@@ -234,7 +232,7 @@ pub fn handle_nix_with_retry(
       );
       let mut retry_cmd = NixCommand::new(subcommand)
         .print_build_logs(true)
-        .args(args.iter().cloned())
+        .args_ref(args)
         .env("NIXPKGS_ALLOW_UNFREE", "1")
         .impure(true);
       if interactive {
@@ -255,7 +253,7 @@ pub fn handle_nix_with_retry(
       );
       let mut retry_cmd = NixCommand::new(subcommand)
         .print_build_logs(true)
-        .args(args.iter().cloned())
+        .args_ref(args)
         .env("NIXPKGS_ALLOW_INSECURE", "1")
         .impure(true);
       if interactive {
@@ -275,7 +273,7 @@ pub fn handle_nix_with_retry(
       );
       let mut retry_cmd = NixCommand::new(subcommand)
         .print_build_logs(true)
-        .args(args.iter().cloned())
+        .args_ref(args)
         .env("NIXPKGS_ALLOW_BROKEN", "1")
         .impure(true);
       if interactive {