Use home crate.

cross-rs · Sep 24, 2019 · cdf3f62 · cdf3f62
1 parent bcad053
commit cdf3f62
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,7 @@ edition = "2018"
 [dependencies]
 atty = "0.2"
 error-chain = "0.12"
+home = "0.5"
 lazy_static = "1.0"
 libc = "0.2.18"
 rustc_version = "0.2"

diff --git a/src/docker.rs b/src/docker.rs
@@ -78,10 +78,8 @@ pub fn run(target: &Target,
            verbose: bool)
            -> Result<ExitStatus> {
     let root = root.path();
-    let home_dir = env::home_dir().ok_or_else(|| "couldn't get home directory. Is $HOME not set?")?;
-    let cargo_dir = env::var_os("CARGO_HOME")
-        .map(PathBuf::from)
-        .unwrap_or_else(|| home_dir.join(".cargo"));
+    let home_dir = home::home_dir().ok_or_else(|| "could not find home directory")?;
+    let cargo_dir = home::cargo_home()?;
     let xargo_dir = env::var_os("XARGO_HOME")
         .map(PathBuf::from)
         .unwrap_or_else(|| home_dir.join(".xargo"));

diff --git a/src/errors.rs b/src/errors.rs
@@ -2,4 +2,8 @@
 
 use error_chain::error_chain;
 
-error_chain!();
+error_chain! {
+  foreign_links {
+    Io(std::io::Error);
+  }
+}