From f2936e493bdc51d7254398a8744aaffa703cdd85 Mon Sep 17 00:00:00 2001
From: "a.stevan" <antoine.stevan@isae-supaero.fr>
Date: Tue, 8 Apr 2025 17:38:43 +0200
Subject: [PATCH] refactor
---
make.rs | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/make.rs b/make.rs
index 7a9705cc..7ff9e4c0 100755
--- a/make.rs
+++ b/make.rs
@@ -155,17 +155,16 @@ fn main() {
nob::run_cmd_and_fail!("docker", "login", REGISTRY);
nob::run_cmd_and_fail!("docker", "login", MIRROR_REGISTRY);
} else if *list {
- let mut cmd_base = vec!["docker", "image", "list", "--format", "json"];
-
- fn extend_and_run (cmd: Vec<&str>, args: &[&str]) -> String {
- let mut cmd = cmd.clone();
+ fn extend_and_run (cmd: &[&str], args: &[&str]) -> String {
+ let mut cmd = cmd.to_vec();
cmd.extend_from_slice(&args);
String::from_utf8(nob::run_cmd_as_vec_and_fail!(+cmd).stdout).expect("Invalid UTF-8 string")
}
+ let cmd = vec!["docker", "image", "list", "--format", "json"];
docker_images_to_table(
- extend_and_run(cmd_base.clone(), &[&repo]) +
- &extend_and_run(cmd_base.clone(), &[&mirror_repo])
+ extend_and_run(&cmd, &[&repo]) +
+ &extend_and_run(&cmd, &[&mirror_repo])
).printstd();
} else if *push {
nob::run_cmd_and_fail!("docker", "push", &image);
--
GitLab