Make support lib error output as verbose as possible

Author: jieyouxu

src/tools/run-make-support/src/lib.rs

@@ -12,10 +12,12 @@ fn setup_common_build_cmd() -> Command {
     cmd
 }
 
-fn handle_failed_output(cmd: &str, output: Output) -> ! {
-    println!("command failed: `{}`", cmd);
-    println!("=== STDOUT ===\n{}\n\n", String::from_utf8(output.stdout).unwrap());
-    println!("=== STDERR ===\n{}\n\n", String::from_utf8(output.stderr).unwrap());
+fn handle_failed_output(cmd: &str, output: Output, caller_line_number: u32) -> ! {
+    eprintln!("command failed at line {caller_line_number}");
+    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());
     std::process::exit(1)
 }
 
@@ -43,10 +45,14 @@ impl RustcInvocationBuilder {
         self
     }
 
+    #[track_caller]
     pub fn run(&mut self) -> Output {
+        let caller_location = std::panic::Location::caller();
+        let caller_line_number = caller_location.line();
+
         let output = self.cmd.output().unwrap();
         if !output.status.success() {
-            handle_failed_output(&format!("{:?}", self.cmd), output);
+            handle_failed_output(&format!("{:#?}", self.cmd), output, caller_line_number);
         }
         output
     }
@@ -69,10 +75,14 @@ impl AuxBuildInvocationBuilder {
         self
     }
 
+    #[track_caller]
     pub fn run(&mut self) -> Output {
+        let caller_location = std::panic::Location::caller();
+        let caller_line_number = caller_location.line();
+
         let output = self.cmd.output().unwrap();
         if !output.status.success() {
-            handle_failed_output(&format!("{:?}", self.cmd), output);
+            handle_failed_output(&format!("{:#?}", self.cmd), output, caller_line_number);
         }
         output
     }
@@ -104,19 +114,27 @@ fn run_common(bin_name: &str) -> (Command, Output) {
 }
 
 /// Run a built binary and make sure it succeeds.
+#[track_caller]
 pub fn run(bin_name: &str) -> Output {
+    let caller_location = std::panic::Location::caller();
+    let caller_line_number = caller_location.line();
+
     let (cmd, output) = run_common(bin_name);
     if !output.status.success() {
-        handle_failed_output(&format!("{:?}", cmd), output);
+        handle_failed_output(&format!("{:#?}", cmd), output, caller_line_number);
     }
     output
 }
 
 /// Run a built binary and make sure it fails.
+#[track_caller]
 pub fn run_fail(bin_name: &str) -> Output {
+    let caller_location = std::panic::Location::caller();
+    let caller_line_number = caller_location.line();
+
     let (cmd, output) = run_common(bin_name);
     if output.status.success() {
-        handle_failed_output(&format!("{:?}", cmd), output);
+        handle_failed_output(&format!("{:#?}", cmd), output, caller_line_number);
     }
     output
 }