wip

Author: djc

src/bin/rustup-init.rs

@@ -13,6 +13,8 @@
 
 #![recursion_limit = "1024"]
 
+use std::env;
+
 use anyhow::{anyhow, Context, Result};
 use cfg_if::cfg_if;
 // Public macros require availability of the internal symbols
@@ -116,9 +118,7 @@ async fn run_rustup_inner() -> Result<utils::ExitCode> {
 
     // Before we do anything else, ensure we know where we are and who we
     // are because otherwise we cannot proceed usefully.
-    let current_dir = process()
-        .current_dir()
-        .context(RustupError::LocatingWorkingDir)?;
+    let current_dir = env::current_dir().context(RustupError::LocatingWorkingDir)?;
     utils::current_exe()?;
 
     match process().name().as_deref() {

src/currentprocess.rs

@@ -106,14 +106,6 @@ impl Process {
         }
     }
 
-    pub fn current_dir(&self) -> io::Result<PathBuf> {
-        match self {
-            Process::OSProcess(_) => env::current_dir(),
-            #[cfg(feature = "test")]
-            Process::TestProcess(p) => Ok(p.cwd.clone()),
-        }
-    }
-
     #[cfg(test)]
     fn id(&self) -> u64 {
         match self {

src/test/mock/clitools.rs

@@ -725,18 +725,21 @@ impl Config {
                     .into_boxed_str(),
             );
         }
+        dbg!("create test process");
         let tp = currentprocess::TestProcess::new(&*self.workdir.borrow(), &arg_strings, vars, "");
         let mut builder = Builder::new_multi_thread();
         builder
             .enable_all()
             .worker_threads(2)
             .max_blocking_threads(2);
+        dbg!("run test process");
         let process_res =
             currentprocess::with_runtime(tp.clone().into(), builder, rustup_mode::main(tp.cwd.clone()));
         // convert Err's into an ec
         let ec = match process_res {
             Ok(process_res) => process_res,
             Err(e) => {
+                dbg!("handle error");
                 currentprocess::with(tp.clone().into(), || crate::cli::common::report_error(&e));
                 utils::ExitCode(1)
             }