From e994534242e742d52c7bab0f0637bc4ed14ec90d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=AE=B8=E6=9D=B0=E5=8F=8B=20Jieyou=20Xu=20=28Joe=29?=
<jieyouxu@outlook.com>
Date: Tue, 9 Apr 2024 21:11:37 +0000
Subject: [PATCH] run-make-support: make `handle_failed_output` take a
`&Command`
---
src/tools/run-make-support/src/lib.rs | 10 +++++-----
src/tools/run-make-support/src/run.rs | 4 ++--
src/tools/run-make-support/src/rustc.rs | 2 +-
src/tools/run-make-support/src/rustdoc.rs | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/tools/run-make-support/src/lib.rs b/src/tools/run-make-support/src/lib.rs
index e0a278d634c..f4d2634c470 100644
--- a/src/tools/run-make-support/src/lib.rs
+++ b/src/tools/run-make-support/src/lib.rs
@@ -82,7 +82,7 @@ pub fn cygpath_windows<P: AsRef<Path>>(path: P) -> String {
cygpath.arg(path.as_ref());
let output = cygpath.output().unwrap();
if !output.status.success() {
- handle_failed_output(&format!("{:#?}", cygpath), output, caller_line_number);
+ handle_failed_output(&cygpath, output, caller_line_number);
}
let s = String::from_utf8(output.stdout).unwrap();
// cygpath -w can attach a newline
@@ -98,18 +98,18 @@ pub fn uname() -> String {
let mut uname = Command::new("uname");
let output = uname.output().unwrap();
if !output.status.success() {
- handle_failed_output(&format!("{:#?}", uname), output, caller_line_number);
+ handle_failed_output(&uname, output, caller_line_number);
}
String::from_utf8(output.stdout).unwrap()
}
-fn handle_failed_output(cmd: &str, output: Output, caller_line_number: u32) -> ! {
+fn handle_failed_output(cmd: &Command, output: Output, caller_line_number: u32) -> ! {
if output.status.success() {
- eprintln!("command incorrectly succeeded at line {caller_line_number}");
+ eprintln!("command unexpectedly succeeded at line {caller_line_number}");
} else {
eprintln!("command failed at line {caller_line_number}");
}
- eprintln!("{cmd}");
+ eprintln!("{cmd:?}");
eprintln!("output status: `{}`", output.status);
eprintln!("=== STDOUT ===\n{}\n\n", String::from_utf8(output.stdout).unwrap());
eprintln!("=== STDERR ===\n{}\n\n", String::from_utf8(output.stderr).unwrap());
diff --git a/src/tools/run-make-support/src/run.rs b/src/tools/run-make-support/src/run.rs
index e33ea9d6e40..9aad91f1b46 100644
--- a/src/tools/run-make-support/src/run.rs
+++ b/src/tools/run-make-support/src/run.rs
@@ -45,7 +45,7 @@ pub fn run(name: &str) -> Output {
let (cmd, output) = run_common(name);
if !output.status.success() {
- handle_failed_output(&format!("{:#?}", cmd), output, caller_line_number);
+ handle_failed_output(&cmd, output, caller_line_number);
}
output
}
@@ -58,7 +58,7 @@ pub fn run_fail(name: &str) -> Output {
let (cmd, output) = run_common(name);
if output.status.success() {
- handle_failed_output(&format!("{:#?}", cmd), output, caller_line_number);
+ handle_failed_output(&cmd, output, caller_line_number);
}
output
}
diff --git a/src/tools/run-make-support/src/rustc.rs b/src/tools/run-make-support/src/rustc.rs
index b76711b4e97..e9552cd881f 100644
--- a/src/tools/run-make-support/src/rustc.rs
+++ b/src/tools/run-make-support/src/rustc.rs
@@ -203,7 +203,7 @@ impl Rustc {
let output = self.cmd.output().unwrap();
if output.status.code().unwrap() != code {
- handle_failed_output(&format!("{:#?}", self.cmd), output, caller_line_number);
+ handle_failed_output(&self.cmd, output, caller_line_number);
}
output
}
diff --git a/src/tools/run-make-support/src/rustdoc.rs b/src/tools/run-make-support/src/rustdoc.rs
index 02af216d805..fc1d99b70a2 100644
--- a/src/tools/run-make-support/src/rustdoc.rs
+++ b/src/tools/run-make-support/src/rustdoc.rs
@@ -87,7 +87,7 @@ impl Rustdoc {
let output = self.cmd.output().unwrap();
if output.status.code().unwrap() != code {
- handle_failed_output(&format!("{:#?}", self.cmd), output, caller_line_number);
+ handle_failed_output(&self.cmd, output, caller_line_number);
}
output
}