Merge pull request #36 from spastorino/minor-warning-fixes

Minor warning fixes

Author: Mark-Simulacrum

Cargo.lock

@@ -12,6 +12,7 @@ version = "0.1.0"
 
 [dependencies]
 dialoguer = "0.3.0"
+dirs = "2.0"
 env_logger = "0.6.0"
 failure = "0.1"
 flate2 = "1.0.1"

Cargo.toml

@@ -7,6 +7,7 @@
 
 extern crate chrono;
 extern crate dialoguer;
+extern crate dirs;
 extern crate env_logger;
 #[macro_use]
 extern crate failure;
@@ -18,7 +19,6 @@ extern crate pbr;
 #[cfg(test)]
 extern crate quickcheck;
 extern crate reqwest;
-#[macro_use]
 extern crate structopt;
 extern crate tar;
 extern crate tee;
@@ -664,7 +664,7 @@ impl Config {
         let mut toolchains_path = match env::var_os("RUSTUP_HOME") {
             Some(h) => PathBuf::from(h),
             None => {
-                let mut home = env::home_dir().ok_or_else(|| format_err!("Could not find home."))?;
+                let mut home = dirs::home_dir().ok_or_else(|| format_err!("Could not find home."))?;
                 home.push(".rustup");
                 home
             }