Commit 7 : Add arg path

rust-lang · Mar 4, 2024 · 0a4502a · 0a4502a
1 parent 979c9f4
commit 0a4502a
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
@@ -45,6 +45,12 @@ impl RustcInvocationBuilder {
         self
     }
 
+    pub fn arg_path(&mut self, path: &[&str]) -> &mut RustcInvocationBuilder {
+        let path_buf = path.iter().collect::<PathBuf>();
+        self.cmd.arg(path_buf.to_str().unwrap());
+        self
+    }
+
     #[track_caller]
     pub fn run(&mut self) -> Output {
         let caller_location = std::panic::Location::caller();

diff --git a/tests/run-make/alloc-no-oom-handling/rmake.rs b/tests/run-make/alloc-no-oom-handling/rmake.rs
@@ -6,14 +6,13 @@ use run_make_support::rustc;
 use std::path::PathBuf;
 
 fn main() {
-    let lib_path = PathBuf::from("../../../library/alloc/src/lib.rs");
     rustc()
         .arg("--edition")
         .arg("2021")
         .arg("-Dwarnings")
         .arg("--crate-type")
         .arg("rlib")
-        .arg(lib_path.to_str().unwrap())
+        .arg_path(&["..", "..", "..", "library", "alloc", "src", "lib.rs"])
         .arg("--cfg")
         .arg("no_global_oom_handling")
         .run();

diff --git a/tests/run-make/alloc-no-rc/rmake.rs b/tests/run-make/alloc-no-rc/rmake.rs
@@ -6,14 +6,13 @@ use run_make_support::rustc;
 use std::path::PathBuf;
 
 fn main() {
-    let lib_path = PathBuf::from("../../../library/alloc/src/lib.rs");
     rustc()
         .arg("--edition")
         .arg("2021")
         .arg("-Dwarnings")
         .arg("--crate-type")
         .arg("rlib")
-        .arg(lib_path.to_str().unwrap())
+        .arg_path(&["..", "..", "..", "library", "alloc", "src", "lib.rs"])
         .arg("--cfg")
         .arg("no_rc")
         .run();

diff --git a/tests/run-make/alloc-no-sync/rmake.rs b/tests/run-make/alloc-no-sync/rmake.rs
@@ -6,14 +6,13 @@ use run_make_support::rustc;
 use std::path::PathBuf;
 
 fn main() {
-    let lib_path = PathBuf::from("../../../library/alloc/src/lib.rs");
     rustc()
         .arg("--edition")
         .arg("2021")
         .arg("-Dwarnings")
         .arg("--crate-type")
         .arg("rlib")
-        .arg(lib_path.to_str().unwrap())
+        .arg_path(&["..", "..", "..", "library", "alloc", "src", "lib.rs"])
         .arg("--cfg")
         .arg("no_sync")
         .run();