switch to color-eyre for error reporting

CHANGELOG.md

@@ -5,6 +5,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+- #654 - Use color-eyre for error reporting
 - #658 - Upgrade dependencies
 - #647 - Add `mips64-unknown-linux-muslabi64` and `mips64el-unknown-linux-muslabi64` support
 - #652 - Allow trying individual targets via bors.

Cargo.toml

@@ -12,7 +12,8 @@ edition = "2018"
 
 [dependencies]
 atty = "0.2"
-error-chain = "0.12"
+color-eyre = "0.6.1"
+eyre = "0.6.7"
 home = "0.5"
 lazy_static = "1.0"
 libc = "0.2.104"

src/cargo.rs

@@ -65,7 +65,7 @@ impl Root {
 
 /// Cargo project root
 pub fn root() -> Result<Option<Root>> {
-    let cd = env::current_dir().chain_err(|| "couldn't get current directory")?;
+    let cd = env::current_dir().wrap_err("couldn't get current directory")?;
 
     let mut dir = &*cd;
     loop {

src/config.rs

@@ -1,7 +1,9 @@
 use crate::{Result, Target, Toml};
 
+use crate::errors::*;
 use std::collections::HashMap;
 use std::env;
+
 #[derive(Debug)]
 struct Environment(&'static str, Option<HashMap<&'static str, &'static str>>);
 
@@ -42,22 +44,20 @@ impl Environment {
             self.get_build_var("XARGO"),
             self.get_target_var(target, "XARGO"),
         );
-        let build_env =
-            if let Some(value) = build_xargo {
-                Some(value.parse::<bool>().map_err(|_| {
-                    format!("error parsing {} from XARGO environment variable", value)
-                })?)
-            } else {
-                None
-            };
-        let target_env =
-            if let Some(value) = target_xargo {
-                Some(value.parse::<bool>().map_err(|_| {
-                    format!("error parsing {} from XARGO environment variable", value)
-                })?)
-            } else {
-                None
-            };
+        let build_env = if let Some(value) = build_xargo {
+            Some(value.parse::<bool>().wrap_err_with(|| {
+                format!("error parsing {} from XARGO environment variable", value)
+            })?)
+        } else {
+            None
+        };
+        let target_env = if let Some(value) = target_xargo {
+            Some(value.parse::<bool>().wrap_err_with(|| {
+                format!("error parsing {} from XARGO environment variable", value)
+            })?)
+        } else {
+            None
+        };
 
         Ok((build_env, target_env))
     }
@@ -279,10 +279,9 @@ mod tests {
 
         fn toml(content: &str) -> Result<crate::Toml> {
             Ok(crate::Toml {
-                table: if let Ok(toml::Value::Table(table)) = content.parse() {
-                    table
-                } else {
-                    return Err("couldn't parse toml as TOML table".into());
+                table: match content.parse().wrap_err("couldn't parse toml")? {
+                    toml::Value::Table(table) => table,
+                    _ => eyre::bail!("couldn't parse toml as TOML table"),
                 },
             })
         }

src/docker.rs

@@ -2,41 +2,35 @@ use std::path::{Path, PathBuf};
 use std::process::{Command, ExitStatus};
 use std::{env, fs};
 
-use atty::Stream;
-use error_chain::bail;
-
 use crate::cargo::Root;
 use crate::errors::*;
 use crate::extensions::{CommandExt, SafeCommand};
 use crate::id;
 use crate::{Config, Target};
+use atty::Stream;
+use eyre::bail;
 
 const DOCKER_IMAGES: &[&str] = &include!(concat!(env!("OUT_DIR"), "/docker-images.rs"));
 const CROSS_IMAGE: &str = "ghcr.io/cross-rs";
 const DOCKER: &str = "docker";
 const PODMAN: &str = "podman";
 
-fn get_container_engine() -> Result<std::path::PathBuf> {
-    let container_engine = env::var("CROSS_CONTAINER_ENGINE").unwrap_or_default();
-
-    if container_engine.is_empty() {
-        which::which(DOCKER)
-            .or_else(|_| which::which(PODMAN))
-            .map_err(|e| e.into())
+fn get_container_engine() -> Result<std::path::PathBuf, which::Error> {
+    if let Ok(ce) = env::var("CROSS_CONTAINER_ENGINE") {
+        which::which(ce)
     } else {
-        which::which(container_engine).map_err(|e| e.into())
+        which::which(DOCKER).or_else(|_| which::which(PODMAN))
     }
 }
 
 pub fn docker_command(subcommand: &str) -> Result<Command> {
-    if let Ok(ce) = get_container_engine() {
-        let mut command = Command::new(ce);
-        command.arg(subcommand);
-        command.args(&["--userns", "host"]);
-        Ok(command)
-    } else {
-        Err("no container engine found; install docker or podman".into())
-    }
+    let ce = get_container_engine()
+        .map_err(|_| eyre::eyre!("no container engine found"))
+        .with_suggestion(|| "is docker or podman installed?")?;
+    let mut command = Command::new(ce);
+    command.arg(subcommand);
+    command.args(&["--userns", "host"]);
+    Ok(command)
 }
 
 /// Register binfmt interpreters
@@ -77,7 +71,7 @@ pub fn run(
     };
 
     let root = root.path();
-    let home_dir = home::home_dir().ok_or("could not find home directory")?;
+    let home_dir = home::home_dir().ok_or_else(|| eyre::eyre!("could not find home directory"))?;
     let cargo_dir = home::cargo_home()?;
     let xargo_dir = env::var_os("XARGO_HOME")
         .map(PathBuf::from)
@@ -233,11 +227,7 @@ pub fn image(config: &Config, target: &Target) -> Result<String> {
 }
 
 fn docker_read_mount_paths() -> Result<Vec<MountDetail>> {
-    let hostname = if let Ok(v) = env::var("HOSTNAME") {
-        Ok(v)
-    } else {
-        Err("HOSTNAME environment variable not found")
-    }?;
+    let hostname = env::var("HOSTNAME").wrap_err("HOSTNAME environment variable not found")?;
 
     let docker_path = which::which(DOCKER)?;
     let mut docker: Command = {
@@ -248,12 +238,7 @@ fn docker_read_mount_paths() -> Result<Vec<MountDetail>> {
     };
 
     let output = docker.run_and_get_stdout(false)?;
-    let info = if let Ok(val) = serde_json::from_str(&output) {
-        Ok(val)
-    } else {
-        Err("failed to parse docker inspect output")
-    }?;
-
+    let info = serde_json::from_str(&output).wrap_err("failed to parse docker inspect output")?;
     dockerinfo_parse_mounts(&info)
 }
 
@@ -268,20 +253,20 @@ fn dockerinfo_parse_root_mount_path(info: &serde_json::Value) -> Result<MountDet
     let driver_name = info
         .pointer("/0/GraphDriver/Name")
         .and_then(|v| v.as_str())
-        .ok_or("No driver name found")?;
+        .ok_or_else(|| eyre::eyre!("no driver name found"))?;
 
     if driver_name == "overlay2" {
         let path = info
             .pointer("/0/GraphDriver/Data/MergedDir")
             .and_then(|v| v.as_str())
-            .ok_or("No merge directory found")?;
+            .ok_or_else(|| eyre::eyre!("No merge directory found"))?;
 
         Ok(MountDetail {
             source: PathBuf::from(&path),
             destination: PathBuf::from("/"),
         })
     } else {
-        Err(format!("want driver overlay2, got {}", driver_name).into())
+        eyre::bail!("want driver overlay2, got {}", driver_name)
     }
 }