Add stdin to run_make_support::command::Command

Rejyr · Rejyr · commit 5a66a796fcf6 · 2024-06-22T14:15:22.000-04:00
diff --git a/src/tools/run-make-support/src/command.rs b/src/tools/run-make-support/src/command.rs
@@ -36,8 +36,10 @@ impl Command {
         Self { cmd: StdCommand::new(program), stdin: None, drop_bomb: DropBomb::arm(program) }
     }
 
-    pub fn set_stdin(&mut self, stdin: Box<[u8]>) {
-        self.stdin = Some(stdin);
+    /// Specify a stdin input
+    pub fn stdin<I: AsRef<[u8]>>(&mut self, input: I) -> &mut Self {
+        self.stdin = Some(input.as_ref().to_vec().into_boxed_slice());
+        self
     }
 
     /// Specify an environment variable.
diff --git a/src/tools/run-make-support/src/llvm.rs b/src/tools/run-make-support/src/llvm.rs
@@ -171,7 +171,7 @@ impl LlvmFilecheck {
 
     /// Pipe a read file into standard input containing patterns that will be matched against the .patterns(path) call.
     pub fn stdin<I: AsRef<[u8]>>(&mut self, input: I) -> &mut Self {
-        self.cmd.set_stdin(input.as_ref().to_vec().into_boxed_slice());
+        self.cmd.stdin(input);
         self
     }
 
diff --git a/src/tools/run-make-support/src/rustc.rs b/src/tools/run-make-support/src/rustc.rs
@@ -244,7 +244,7 @@ impl Rustc {
 
     /// Specify a stdin input
     pub fn stdin<I: AsRef<[u8]>>(&mut self, input: I) -> &mut Self {
-        self.cmd.set_stdin(input.as_ref().to_vec().into_boxed_slice());
+        self.cmd.stdin(input);
         self
     }
 
diff --git a/src/tools/run-make-support/src/rustdoc.rs b/src/tools/run-make-support/src/rustdoc.rs
@@ -92,7 +92,7 @@ impl Rustdoc {
 
     /// Specify a stdin input
     pub fn stdin<I: AsRef<[u8]>>(&mut self, input: I) -> &mut Self {
-        self.cmd.set_stdin(input.as_ref().to_vec().into_boxed_slice());
+        self.cmd.stdin(input);
         self
     }
 

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,10 @@ impl Command {`
`36`	`36`	`Self { cmd: StdCommand::new(program), stdin: None, drop_bomb: DropBomb::arm(program) }`
`37`	`37`	`}`
`38`	`38`
`39`		`- pub fn set_stdin(&mut self, stdin: Box<[u8]>) {`
`40`		`- self.stdin = Some(stdin);`
	`39`	`+ /// Specify a stdin input`
	`40`	`+ pub fn stdin<I: AsRef<[u8]>>(&mut self, input: I) -> &mut Self {`
	`41`	`+ self.stdin = Some(input.as_ref().to_vec().into_boxed_slice());`
	`42`	`+ self`
`41`	`43`	`}`
`42`	`44`
`43`	`45`	`/// Specify an environment variable.`
Original file line number	Diff line number	Diff line change
`@@ -171,7 +171,7 @@ impl LlvmFilecheck {`
`171`	`171`
`172`	`172`	`/// Pipe a read file into standard input containing patterns that will be matched against the .patterns(path) call.`
`173`	`173`	`pub fn stdin<I: AsRef<[u8]>>(&mut self, input: I) -> &mut Self {`
`174`		`- self.cmd.set_stdin(input.as_ref().to_vec().into_boxed_slice());`
	`174`	`+ self.cmd.stdin(input);`
`175`	`175`	`self`
`176`	`176`	`}`
`177`	`177`
Original file line number	Diff line number	Diff line change
`@@ -244,7 +244,7 @@ impl Rustc {`
`244`	`244`
`245`	`245`	`/// Specify a stdin input`
`246`	`246`	`pub fn stdin<I: AsRef<[u8]>>(&mut self, input: I) -> &mut Self {`
`247`		`- self.cmd.set_stdin(input.as_ref().to_vec().into_boxed_slice());`
	`247`	`+ self.cmd.stdin(input);`
`248`	`248`	`self`
`249`	`249`	`}`
`250`	`250`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ impl Rustdoc {`
`92`	`92`
`93`	`93`	`/// Specify a stdin input`
`94`	`94`	`pub fn stdin<I: AsRef<[u8]>>(&mut self, input: I) -> &mut Self {`
`95`		`- self.cmd.set_stdin(input.as_ref().to_vec().into_boxed_slice());`
	`95`	`+ self.cmd.stdin(input);`
`96`	`96`	`self`
`97`	`97`	`}`
`98`	`98`