Merge pull request #2393 from rbtcollins/fix-windows

Fix homedir detection on Windows

Author: kinnison

Cargo.lock

@@ -28,7 +28,7 @@ error-chain = "0.12"
 effective-limits = "0.5.1"
 flate2 = "1"
 git-testament = "0.1.4"
-home = { git = "https://github.com/rbtcollins/home", rev="81c8dfcd815765daf384319a04e237feb9d5e72d"  }
+home = { git = "https://github.com/rbtcollins/home", rev="a243ee2fbee6022c57d56f5aa79aefe194eabe53"  }
 lazy_static = "1"
 libc = "0.2"
 num_cpus = "1.13"

Cargo.toml

@@ -52,6 +52,30 @@ use varsource::*;
 /// needing to thread trait parameters across the entire code base: none of the
 /// methods are in performance critical loops (except perhaps progress bars -
 /// and even there we should be doing debouncing and managing update rates).
+/// 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 {
+    fn clone_boxed(&self) -> Box<dyn HomeProcess>;
+}
+
+// Machinery for Cloning boxes
+
+impl<T> HomeProcess for T
+where
+    T: 'static + CurrentProcess + home::Env + Clone,
+{
+    fn clone_boxed(&self) -> Box<dyn HomeProcess + 'static> {
+        Box::new(T::clone(self))
+    }
+}
+
+impl Clone for Box<dyn HomeProcess + 'static> {
+    fn clone(&self) -> Self {
+        HomeProcess::clone_boxed(self.as_ref())
+    }
+}
+
 pub trait CurrentProcess:
     ArgSource
     + CurrentDirSource
@@ -93,6 +117,11 @@ impl Clone for Box<dyn CurrentProcess + 'static> {
 
 /// Obtain the current instance of CurrentProcess
 pub fn process() -> Box<dyn CurrentProcess> {
+    CurrentProcess::clone_boxed(&*home_process())
+}
+
+/// Obtain the current instance of HomeProcess
+pub fn home_process() -> Box<dyn HomeProcess> {
     match PROCESS.with(|p| p.borrow().clone()) {
         None => panic!("No process instance"),
         Some(p) => p,
@@ -105,7 +134,7 @@ static HOOK_INSTALLED: Once = Once::new();
 ///
 /// If the function panics, the process definition *in that thread* is cleared
 /// by an implicitly installed global panic hook.
-pub fn with<F, R>(process: Box<dyn CurrentProcess>, f: F) -> R
+pub fn with<F, R>(process: Box<dyn HomeProcess>, f: F) -> R
 where
     F: FnOnce() -> R,
 {
@@ -134,7 +163,7 @@ fn clear_process() {
 }
 
 thread_local! {
-    pub static PROCESS:RefCell<Option<Box<dyn CurrentProcess>>> = RefCell::new(None);
+    pub static PROCESS:RefCell<Option<Box<dyn HomeProcess>>> = RefCell::new(None);
 }
 
 // PID related things

src/currentprocess.rs

@@ -5,10 +5,24 @@ use std::ops::Deref;
 use std::path::PathBuf;
 
 use super::CurrentDirSource;
-use super::CurrentProcess;
+use super::HomeProcess;
+use super::OSProcess;
+use super::TestProcess;
 use super::VarSource;
 
-impl home::Env for Box<dyn CurrentProcess + 'static> {
+impl home::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))
+    }
+    fn var_os(&self, key: &str) -> Option<OsString> {
+        home::Env::var_os(&(**self), key)
+    }
+}
+
+impl home::Env for TestProcess {
     fn home_dir(&self) -> Option<PathBuf> {
         self.var("HOME").ok().map(|v| v.into())
     }
@@ -19,3 +33,15 @@ impl home::Env for Box<dyn CurrentProcess + 'static> {
         VarSource::var_os(self.deref(), key)
     }
 }
+
+impl home::Env for OSProcess {
+    fn home_dir(&self) -> Option<PathBuf> {
+        home::OS_ENV.home_dir()
+    }
+    fn current_dir(&self) -> Result<PathBuf, io::Error> {
+        home::OS_ENV.current_dir()
+    }
+    fn var_os(&self, key: &str) -> Option<OsString> {
+        home::OS_ENV.var_os(key)
+    }
+}

src/currentprocess/homethunk.rs

@@ -13,9 +13,9 @@ use url::Url;
 
 // use crate::currentprocess::cwdsource::CurrentDirSource;
 use crate::errors::*;
-use crate::process;
 use crate::utils::notifications::Notification;
 use crate::utils::raw;
+use crate::{home_process, process};
 
 pub use crate::utils::utils::raw::{
     find_cmd, has_cmd, if_not_empty, is_directory, is_file, path_exists, prefix_arg, random_string,
@@ -481,11 +481,11 @@ pub fn to_absolute<P: AsRef<Path>>(path: P) -> Result<PathBuf> {
 }
 
 pub fn home_dir() -> Option<PathBuf> {
-    home::home_dir_from(&process())
+    home::home_dir_from(&home_process())
 }
 
 pub fn cargo_home() -> Result<PathBuf> {
-    home::cargo_home_from(&process()).map_err(|e| Error::from_kind(ErrorKind::Io(e)))
+    home::cargo_home_from(&home_process()).map_err(|e| Error::from_kind(ErrorKind::Io(e)))
 }
 
 // Creates a ~/.rustup folder
@@ -511,7 +511,7 @@ pub fn rustup_home_in_user_dir() -> Result<PathBuf> {
 }
 
 pub fn rustup_home() -> Result<PathBuf> {
-    home::rustup_home_from(&process()).map_err(|e| Error::from_kind(ErrorKind::Io(e)))
+    home::rustup_home_from(&home_process()).map_err(|e| Error::from_kind(ErrorKind::Io(e)))
 }
 
 pub fn format_path_for_display(path: &str) -> String {