#[derive(Debug)]
pub enum CliError {
- CommandFailed(String),
+ CommandFailed(String, String),
IoError(io::Error),
RustfmtNotInstalled,
WalkDirError(walkdir::Error),
fn output_err(err: CliError) {
match err {
- CliError::CommandFailed(command) => {
- eprintln!("error: A command failed! `{}`", command);
+ CliError::CommandFailed(command, stderr) => {
+ eprintln!("error: A command failed! `{}`\nstderr: {}", command, stderr);
},
CliError::IoError(err) => {
eprintln!("error: {}", err);
println!("{}", format_command(&program, &dir, args));
}
- let mut child = Command::new(&program).current_dir(&dir).args(args.iter()).spawn()?;
- let code = child.wait()?;
- let success = code.success();
+ let child = Command::new(&program).current_dir(&dir).args(args.iter()).spawn()?;
+ let output = child.wait_with_output()?;
+ let success = output.status.success();
if !context.check && !success {
- return Err(CliError::CommandFailed(format_command(&program, &dir, args)));
+ let stderr = std::str::from_utf8(&output.stderr).unwrap_or("");
+ return Err(CliError::CommandFailed(
+ format_command(&program, &dir, args),
+ String::from(stderr),
+ ));
}
Ok(success)
{
Err(CliError::RustfmtNotInstalled)
} else {
- Err(CliError::CommandFailed(format_command(&program, &dir, args)))
+ Err(CliError::CommandFailed(
+ format_command(&program, &dir, args),
+ std::str::from_utf8(&output.stderr).unwrap_or("").to_string(),
+ ))
}
}