1 files changed, 7 insertions, 9 deletions

diff --git a/xtask/src/lib.rs b/xtask/src/lib.rs
index bae4c4650..bfee2f9c8 100644
--- a/xtask/src/lib.rs
+++ b/xtask/src/lib.rs
@@ -2,10 +2,10 @@
 
 pub mod codegen;
 
+use anyhow::Context;
+pub use anyhow::Result;
 use std::{
-    env,
-    error::Error,
-    fs,
+    env, fs,
     io::{Error as IoError, ErrorKind},
     path::{Path, PathBuf},
     process::{Command, Output, Stdio},
@@ -13,8 +13,6 @@ use std::{
 
 use crate::codegen::Mode;
 
-pub type Result<T> = std::result::Result<T, Box<dyn Error>>;
-
 const TOOLCHAIN: &str = "stable";
 
 pub fn project_root() -> PathBuf {
@@ -69,7 +67,7 @@ pub fn run_rustfmt(mode: Mode) -> Result<()> {
         .status()
     {
         Ok(status) if status.success() => (),
-        _ => install_rustfmt()?,
+        _ => install_rustfmt().context("install rustfmt")?,
     };
 
     if mode == Mode::Verify {
@@ -112,7 +110,7 @@ pub fn run_clippy() -> Result<()> {
         .status()
     {
         Ok(status) if status.success() => (),
-        _ => install_clippy()?,
+        _ => install_clippy().context("install clippy")?,
     };
 
     let allowed_lints = [
@@ -162,9 +160,9 @@ where
     let exec = args.next().unwrap();
     let mut cmd = Command::new(exec);
     f(cmd.args(args).current_dir(proj_dir).stderr(Stdio::inherit()));
-    let output = cmd.output()?;
+    let output = cmd.output().with_context(|| format!("running `{}`", cmdline))?;
     if !output.status.success() {
-        Err(format!("`{}` exited with {}", cmdline, output.status))?;
+        anyhow::bail!("`{}` exited with {}", cmdline, output.status);
     }
     Ok(output)
 }