From f8f39399a41519eaa1f2392b930eeda8d97fb49f Mon Sep 17 00:00:00 2001 From: 5225225 <5225225@mailbox.org> Date: Sat, 23 Mar 2024 18:37:53 +0000 Subject: [PATCH] rename rustdoc, use asref path --- src/tools/run-make-support/src/rustdoc.rs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/tools/run-make-support/src/rustdoc.rs b/src/tools/run-make-support/src/rustdoc.rs index 7f3ca66ee3158..7c7886a6bd42f 100644 --- a/src/tools/run-make-support/src/rustdoc.rs +++ b/src/tools/run-make-support/src/rustdoc.rs @@ -4,32 +4,32 @@ use std::process::{Command, Output}; use crate::{add_host_rpath_env, handle_failed_output}; -pub fn rustdoc() -> RustdocInvocationBuilder { - RustdocInvocationBuilder::new() +pub fn rustdoc() -> Rustdoc { + Rustdoc::new() } #[derive(Debug)] -pub struct RustdocInvocationBuilder { +pub struct Rustdoc { cmd: Command, } -impl RustdocInvocationBuilder { +impl Rustdoc { fn new() -> Self { let cmd = setup_common_rustdoc_build_cmd(); Self { cmd } } - pub fn arg(&mut self, arg: &str) -> &mut RustdocInvocationBuilder { + pub fn arg(&mut self, arg: &str) -> &mut Rustdoc { self.cmd.arg(arg); self } - pub fn arg_file(&mut self, arg: &Path) -> &mut RustdocInvocationBuilder { - self.cmd.arg(arg); + pub fn arg_file>(&mut self, arg: P) -> &mut Rustdoc { + self.cmd.arg(arg.as_ref()); self } - pub fn env(&mut self, key: &str, value: &str) -> &mut RustdocInvocationBuilder { + pub fn env(&mut self, key: &str, value: &str) -> &mut Rustdoc { self.cmd.env(key, value); self }