From de79a6c08405bbaaa7fa9431d26ae0bacdfb0213 Mon Sep 17 00:00:00 2001
From: 5225225 <5225225@mailbox.org>
Date: Tue, 9 Apr 2024 19:55:06 +0100
Subject: [PATCH] run-make: make arg take AsRef<OsStr> instead of str

---
 src/tools/run-make-support/src/rustdoc.rs | 11 +++--------
 tests/run-make/exit-code/rmake.rs         |  3 ++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/tools/run-make-support/src/rustdoc.rs b/src/tools/run-make-support/src/rustdoc.rs
index cbf328b67fde2..1fb4b589d76af 100644
--- a/src/tools/run-make-support/src/rustdoc.rs
+++ b/src/tools/run-make-support/src/rustdoc.rs
@@ -1,4 +1,5 @@
 use std::env;
+use std::ffi::OsStr;
 use std::path::Path;
 use std::process::{Command, Output};
 
@@ -58,18 +59,12 @@ impl Rustdoc {
         self
     }
 
-    /// Fallback argument provider. Consider adding meaningfully named methods instead of using
-    /// this method.
-    pub fn arg(&mut self, arg: &str) -> &mut Self {
+    /// Generic command argument provider. Use `.arg("-Zname")` over `.arg("-Z").arg("arg")`.
+    pub fn arg<S: AsRef<OsStr>>(&mut self, arg: S) -> &mut Self {
         self.cmd.arg(arg);
         self
     }
 
-    pub fn arg_path<P: AsRef<Path>>(&mut self, path: P) -> &mut Self {
-        self.cmd.arg(path.as_ref());
-        self
-    }
-
     /// Run the build `rustdoc` command and assert that the run is successful.
     #[track_caller]
     pub fn run(&mut self) -> Output {
diff --git a/tests/run-make/exit-code/rmake.rs b/tests/run-make/exit-code/rmake.rs
index 8fcdb4acdc587..f387626287e3f 100644
--- a/tests/run-make/exit-code/rmake.rs
+++ b/tests/run-make/exit-code/rmake.rs
@@ -25,7 +25,8 @@ fn main() {
 
     rustdoc()
         .arg("success.rs")
-        .arg("-o").arg_path(tmp_dir().join("exit-code"))
+        .arg("-o")
+        .arg(tmp_dir().join("exit-code"))
         .run();
 
     rustdoc()