Update home usage to new env fn

Author: LucioFranco

src/currentprocess.rs

@@ -55,15 +55,15 @@ use varsource::*;
 /// The real trait is CurrentProcess; HomeProcess is a single trait because
 /// Box<T> only allows autotraits to be added to it; so we use a subtrait to add
 /// home::Env in.
-pub trait HomeProcess: CurrentProcess + home::Env {
+pub trait HomeProcess: CurrentProcess + home::env::Env {
     fn clone_boxed(&self) -> Box<dyn HomeProcess>;
 }
 
 // Machinery for Cloning boxes
 
 impl<T> HomeProcess for T
 where
-    T: 'static + CurrentProcess + home::Env + Clone,
+    T: 'static + CurrentProcess + home::env::Env + Clone,
 {
     fn clone_boxed(&self) -> Box<dyn HomeProcess + 'static> {
         Box::new(T::clone(self))

src/currentprocess/homethunk.rs

@@ -10,19 +10,19 @@ use super::OSProcess;
 use super::TestProcess;
 use super::VarSource;
 
-impl home::Env for Box<dyn HomeProcess + 'static> {
+impl home::env::Env for Box<dyn HomeProcess + 'static> {
     fn home_dir(&self) -> Option<PathBuf> {
         (**self).home_dir()
     }
     fn current_dir(&self) -> Result<PathBuf, io::Error> {
-        home::Env::current_dir(&(**self))
+        home::env::Env::current_dir(&(**self))
     }
     fn var_os(&self, key: &str) -> Option<OsString> {
-        home::Env::var_os(&(**self), key)
+        home::env::Env::var_os(&(**self), key)
     }
 }
 
-impl home::Env for TestProcess {
+impl home::env::Env for TestProcess {
     fn home_dir(&self) -> Option<PathBuf> {
         self.var("HOME").ok().map(|v| v.into())
     }
@@ -34,14 +34,14 @@ impl home::Env for TestProcess {
     }
 }
 
-impl home::Env for OSProcess {
+impl home::env::Env for OSProcess {
     fn home_dir(&self) -> Option<PathBuf> {
-        home::OS_ENV.home_dir()
+        home::env::OS_ENV.home_dir()
     }
     fn current_dir(&self) -> Result<PathBuf, io::Error> {
-        home::OS_ENV.current_dir()
+        home::env::OS_ENV.current_dir()
     }
     fn var_os(&self, key: &str) -> Option<OsString> {
-        home::OS_ENV.var_os(key)
+        home::env::OS_ENV.var_os(key)
     }
 }

src/utils/utils.rs

@@ -493,11 +493,11 @@ pub(crate) fn to_absolute<P: AsRef<Path>>(path: P) -> Result<PathBuf> {
 }
 
 pub(crate) fn home_dir() -> Option<PathBuf> {
-    home::home_dir_from(&home_process())
+    home::env::home_dir_with_env(&home_process())
 }
 
 pub(crate) fn cargo_home() -> Result<PathBuf> {
-    home::cargo_home_from(&home_process()).context("failed to determine cargo home")
+    home::env::cargo_home_with_env(&home_process()).context("failed to determine cargo home")
 }
 
 // Creates a ~/.rustup folder
@@ -524,7 +524,7 @@ fn rustup_home_in_user_dir() -> Result<PathBuf> {
 }
 
 pub(crate) fn rustup_home() -> Result<PathBuf> {
-    home::rustup_home_from(&home_process()).context("failed to determine rustup home dir")
+    home::env::rustup_home_with_env(&home_process()).context("failed to determine rustup home dir")
 }
 
 pub(crate) fn format_path_for_display(path: &str) -> String {