Improve target method API in run-make-support

GuillaumeGomez · GuillaumeGomez · commit fcfac05657ac · 2024-07-01T10:55:57.000+02:00
diff --git a/src/tools/run-make-support/src/rustc.rs b/src/tools/run-make-support/src/rustc.rs
@@ -201,7 +201,8 @@ impl Rustc {
     }
 
     /// Specify the target triple, or a path to a custom target json spec file.
-    pub fn target(&mut self, target: &str) -> &mut Self {
+    pub fn target<S: AsRef<str>>(&mut self, target: S) -> &mut Self {
+        let target = target.as_ref();
         self.cmd.arg(format!("--target={target}"));
         self
     }
diff --git a/src/tools/run-make-support/src/rustdoc.rs b/src/tools/run-make-support/src/rustdoc.rs
@@ -104,7 +104,8 @@ impl Rustdoc {
     }
 
     /// Specify the target triple, or a path to a custom target json spec file.
-    pub fn target(&mut self, target: &str) -> &mut Self {
+    pub fn target<S: AsRef<str>>(&mut self, target: S) -> &mut Self {
+        let target = target.as_ref();
         self.cmd.arg(format!("--target={target}"));
         self
     }
diff --git a/tests/run-make/comment-section/rmake.rs b/tests/run-make/comment-section/rmake.rs
@@ -21,7 +21,7 @@ fn main() {
         .stdin("fn main() {}")
         .emit("link,obj")
         .arg("-Csave-temps")
-        .target(&target)
+        .target(target)
         .run();
 
     // Check linked output has a `.comment` section with the expected content.
diff --git a/tests/run-make/inaccessible-temp-dir/rmake.rs b/tests/run-make/inaccessible-temp-dir/rmake.rs
@@ -28,7 +28,7 @@ fn main() {
         // Run rustc with `-Z temps-dir` set to a directory *inside* the inaccessible one,
         // so that it can't create `tmp`.
         rustc()
-            .target(&target())
+            .target(target())
             .input("program.rs")
             .arg("-Ztemps-dir=inaccessible/tmp")
             .run_fail()
diff --git a/tests/run-make/static-pie/rmake.rs b/tests/run-make/static-pie/rmake.rs
@@ -51,7 +51,7 @@ fn test(compiler: &str) {
 
     rustc()
         .input("test-aslr.rs")
-        .target(&target())
+        .target(target())
         .linker(compiler)
         .arg("-Clinker-flavor=gcc")
         .arg("-Ctarget-feature=+crt-static")

Original file line number	Diff line number	Diff line change
`@@ -201,7 +201,8 @@ impl Rustc {`
`201`	`201`	`}`
`202`	`202`
`203`	`203`	`/// Specify the target triple, or a path to a custom target json spec file.`
`204`		`- pub fn target(&mut self, target: &str) -> &mut Self {`
	`204`	`+ pub fn target<S: AsRef<str>>(&mut self, target: S) -> &mut Self {`
	`205`	`+ let target = target.as_ref();`
`205`	`206`	`self.cmd.arg(format!("--target={target}"));`
`206`	`207`	`self`
`207`	`208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,8 @@ impl Rustdoc {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`/// Specify the target triple, or a path to a custom target json spec file.`
`107`		`- pub fn target(&mut self, target: &str) -> &mut Self {`
	`107`	`+ pub fn target<S: AsRef<str>>(&mut self, target: S) -> &mut Self {`
	`108`	`+ let target = target.as_ref();`
`108`	`109`	`self.cmd.arg(format!("--target={target}"));`
`109`	`110`	`self`
`110`	`111`	`}`