]> git.lizzy.rs Git - rust.git/commitdiff
Add stderr to error message
authorAleksey Kladov <aleksey.kladov@gmail.com>
Fri, 8 May 2020 16:53:53 +0000 (18:53 +0200)
committerAleksey Kladov <aleksey.kladov@gmail.com>
Fri, 8 May 2020 16:53:53 +0000 (18:53 +0200)
crates/ra_project_model/src/lib.rs

index 5a0a87ed7d44428df5655d23ba62427534e8b670..3adb8baf6aadf2c255dc9378a963faa61062ce4a 100644 (file)
@@ -600,7 +600,12 @@ pub fn get_rustc_cfg_options(target: Option<&String>) -> CfgOptions {
 fn output(mut cmd: Command) -> Result<Output> {
     let output = cmd.output().with_context(|| format!("{:?} failed", cmd))?;
     if !output.status.success() {
-        bail!("{:?} failed, {}", cmd, output.status)
+        match String::from_utf8(output.stderr) {
+            Ok(stderr) if !stderr.is_empty() => {
+                bail!("{:?} failed, {}\nstderr:\n{}", cmd, output.status, stderr)
+            }
+            _ => bail!("{:?} failed, {}", cmd, output.status),
+        }
     }
     Ok(output)
 }