Rollup merge of #127161 - GuillaumeGomez:improve-run-make-args, r=Kobzol

matthiaskrgr · web-flow · commit 403719735356 · 2024-06-30T18:25:35.000+02:00
Improve `run-make-support` library `args` API

It allows to pass both `Vec` and slices, which makes it much better (for me at least 😉).

r? ``@Kobzol``
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
@@ -525,11 +525,12 @@ macro_rules! impl_common_helpers {
             /// Generic command arguments provider. Prefer specific helper methods if possible.
             /// Note that for some executables, arguments might be platform specific. For C/C++
             /// compilers, arguments might be platform *and* compiler specific.
-            pub fn args<S>(&mut self, args: &[S]) -> &mut Self
+            pub fn args<V, S>(&mut self, args: V) -> &mut Self
             where
+                V: AsRef<[S]>,
                 S: AsRef<::std::ffi::OsStr>,
             {
-                self.cmd.args(args);
+                self.cmd.args(args.as_ref());
                 self
             }
 
diff --git a/tests/run-make/arguments-non-c-like-enum/rmake.rs b/tests/run-make/arguments-non-c-like-enum/rmake.rs
@@ -10,8 +10,8 @@ pub fn main() {
     cc().input("test.c")
         .input(static_lib_name("nonclike"))
         .out_exe("test")
-        .args(&extra_c_flags())
-        .args(&extra_cxx_flags())
+        .args(extra_c_flags())
+        .args(extra_cxx_flags())
         .inspect(|cmd| eprintln!("{cmd:?}"))
         .run();
     run("test");
diff --git a/tests/run-make/c-link-to-rust-staticlib/rmake.rs b/tests/run-make/c-link-to-rust-staticlib/rmake.rs
@@ -9,7 +9,7 @@ use std::fs;
 
 fn main() {
     rustc().input("foo.rs").run();
-    cc().input("bar.c").input(static_lib_name("foo")).out_exe("bar").args(&extra_c_flags()).run();
+    cc().input("bar.c").input(static_lib_name("foo")).out_exe("bar").args(extra_c_flags()).run();
     run("bar");
     remove_file(static_lib_name("foo"));
     run("bar");
diff --git a/tests/run-make/c-link-to-rust-va-list-fn/rmake.rs b/tests/run-make/c-link-to-rust-va-list-fn/rmake.rs
@@ -12,7 +12,7 @@ fn main() {
     cc().input("test.c")
         .input(static_lib_name("checkrust"))
         .out_exe("test")
-        .args(&extra_c_flags())
+        .args(extra_c_flags())
         .run();
     run("test");
 }
diff --git a/tests/run-make/glibc-staticlib-args/rmake.rs b/tests/run-make/glibc-staticlib-args/rmake.rs
@@ -11,8 +11,8 @@ fn main() {
     cc().input("program.c")
         .arg(static_lib_name("library"))
         .out_exe("program")
-        .args(&extra_c_flags())
-        .args(&extra_cxx_flags())
+        .args(extra_c_flags())
+        .args(extra_cxx_flags())
         .run();
     run(&bin_name("program"));
 }
diff --git a/tests/run-make/print-check-cfg/rmake.rs b/tests/run-make/print-check-cfg/rmake.rs
@@ -86,12 +86,8 @@ fn main() {
 }
 
 fn check(CheckCfg { args, contains }: CheckCfg) {
-    let output = rustc()
-        .input("lib.rs")
-        .arg("-Zunstable-options")
-        .arg("--print=check-cfg")
-        .args(&*args)
-        .run();
+    let output =
+        rustc().input("lib.rs").arg("-Zunstable-options").arg("--print=check-cfg").args(args).run();
 
     let stdout = output.stdout_utf8();
 
diff --git a/tests/run-make/return-non-c-like-enum/rmake.rs b/tests/run-make/return-non-c-like-enum/rmake.rs
@@ -11,8 +11,8 @@ fn main() {
     cc().input("test.c")
         .arg(&static_lib_name("nonclike"))
         .out_exe("test")
-        .args(&extra_c_flags())
-        .args(&extra_cxx_flags())
+        .args(extra_c_flags())
+        .args(extra_cxx_flags())
         .run();
     run("test");
 }
diff --git a/tests/run-make/textrel-on-minimal-lib/rmake.rs b/tests/run-make/textrel-on-minimal-lib/rmake.rs
@@ -20,8 +20,8 @@ fn main() {
         .out_exe(&dynamic_lib_name("bar"))
         .arg("-fPIC")
         .arg("-shared")
-        .args(&extra_c_flags())
-        .args(&extra_cxx_flags())
+        .args(extra_c_flags())
+        .args(extra_cxx_flags())
         .run();
     llvm_readobj()
         .input(dynamic_lib_name("bar"))

Original file line number	Diff line number	Diff line change
`@@ -525,11 +525,12 @@ macro_rules! impl_common_helpers {`
`525`	`525`	`/// Generic command arguments provider. Prefer specific helper methods if possible.`
`526`	`526`	`/// Note that for some executables, arguments might be platform specific. For C/C++`
`527`	`527`	`/// compilers, arguments might be platform and compiler specific.`
`528`		`- pub fn args<S>(&mut self, args: &[S]) -> &mut Self`
	`528`	`+ pub fn args<V, S>(&mut self, args: V) -> &mut Self`
`529`	`529`	`where`
	`530`	`+ V: AsRef<[S]>,`
`530`	`531`	`S: AsRef<::std::ffi::OsStr>,`
`531`	`532`	`{`
`532`		`- self.cmd.args(args);`
	`533`	`+ self.cmd.args(args.as_ref());`
`533`	`534`	`self`
`534`	`535`	`}`
`535`	`536`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ fn main() {`
`12`	`12`	`cc().input("test.c")`
`13`	`13`	`.input(static_lib_name("checkrust"))`
`14`	`14`	`.out_exe("test")`
`15`		`- .args(&extra_c_flags())`
	`15`	`+ .args(extra_c_flags())`
`16`	`16`	`.run();`
`17`	`17`	`run("test");`
`18`	`18`	`}`