switch to color-eyre for error reporting

.github/bors.toml

@@ -1,5 +1,6 @@
 block_labels = ["needs-decision"]
 delete_merged_branches = true
 required_approvals = 1
+use_codeowners = true
 status = ["conclusion"]
 timeout_sec = 21600

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,21 +12,22 @@ edition = "2018"
 
 [dependencies]
 atty = "0.2"
-error-chain = "0.12"
+color-eyre = "0.6"
+eyre = "0.6"
 home = "0.5"
-lazy_static = "1.0"
-libc = "0.2.104"
+lazy_static = "1"
 rustc_version = "0.4"
 toml = "0.5"
 which = { version = "4", default_features = false }
-shell-escape = "0.1.4"
-serde_json = "1.0.48"
+shell-escape = "0.1"
+serde_json = "1"
 
 [target.'cfg(not(windows))'.dependencies]
 nix = "0.23"
+libc = "0.2"
 
 [target.'cfg(windows)'.dependencies]
-winapi = { version = "0.3.7", features = ["winbase"] }
+winapi = { version = "0.3", features = ["winbase"] }
 
 [profile.release]
 lto = true

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"),
                 },
             })
         }