Simplify process access to argument iterator

Author: djc

src/cli/common.rs

@@ -15,7 +15,6 @@ use once_cell::sync::Lazy;
 use super::self_update;
 use crate::cli::download_tracker::DownloadTracker;
 use crate::currentprocess::{
-    argsource::ArgSource,
     filesource::{StdinSource, StdoutSource},
     terminalsource,
     varsource::VarSource,

src/cli/proxy_mode.rs

@@ -5,7 +5,6 @@ use anyhow::Result;
 use crate::{
     cli::{common::set_globals, job, self_update},
     command::run_command_for_dir,
-    currentprocess::argsource::ArgSource,
     toolchain::names::{LocalToolchainName, ResolvableLocalToolchainName},
     utils::utils::{self, ExitCode},
     Cfg,
@@ -18,7 +17,8 @@ pub fn main(arg0: &str) -> Result<ExitCode> {
     let ExitCode(c) = {
         let _setup = job::setup();
 
-        let mut args = crate::process().args_os().skip(1);
+        let process = crate::process();
+        let mut args = process.args_os().skip(1);
 
         // Check for a + toolchain specifier
         let arg1 = args.next();

src/cli/rustup_mode.rs

@@ -20,10 +20,7 @@ use crate::{
         topical_doc,
     },
     command,
-    currentprocess::{
-        argsource::ArgSource,
-        filesource::{StderrSource, StdoutSource},
-    },
+    currentprocess::filesource::{StderrSource, StdoutSource},
     dist::{
         dist::{PartialToolchainDesc, Profile, TargetTriple},
         manifest::{Component, ComponentStatus},
@@ -1667,7 +1664,8 @@ fn set_profile(cfg: &mut Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
 
 fn set_auto_self_update(cfg: &mut Cfg, m: &ArgMatches) -> Result<utils::ExitCode> {
     if self_update::NEVER_SELF_UPDATE {
-        let mut args = crate::process().args_os();
+        let process = crate::process();
+        let mut args = process.args_os();
         let arg0 = args.next().map(PathBuf::from);
         let arg0 = arg0
             .as_ref()

src/cli/setup_mode.rs

@@ -6,7 +6,7 @@ use crate::{
         common,
         self_update::{self, InstallOpts},
     },
-    currentprocess::{argsource::ArgSource, filesource::StdoutSource},
+    currentprocess::filesource::StdoutSource,
     dist::dist::Profile,
     process,
     toolchain::names::MaybeOfficialToolchainName,

src/currentprocess.rs

@@ -19,14 +19,12 @@ use home::env as home;
 #[cfg(feature = "test")]
 use rand::{thread_rng, Rng};
 
-pub mod argsource;
 pub mod cwdsource;
 pub mod filesource;
 mod homethunk;
 pub mod terminalsource;
 pub mod varsource;
 
-use argsource::*;
 use cwdsource::*;
 use filesource::*;
 use varsource::*;
@@ -68,7 +66,6 @@ use varsource::*;
 #[enum_dispatch]
 pub trait CurrentProcess:
     home::Env
-    + ArgSource
     + CurrentDirSource
     + VarSource
     + StdoutSource
@@ -83,7 +80,6 @@ pub trait CurrentProcess:
 #[derive(Clone, Debug)]
 #[enum_dispatch(
     CurrentProcess,
-    ArgSource,
     CurrentDirSource,
     VarSource,
     StdoutSource,
@@ -110,6 +106,22 @@ impl Process {
             .and_then(std::ffi::OsStr::to_str)
             .map(String::from)
     }
+
+    pub(crate) fn args(&self) -> Box<dyn Iterator<Item = String> + '_> {
+        match self {
+            Process::OSProcess(_) => Box::new(env::args()),
+            #[cfg(feature = "test")]
+            Process::TestProcess(p) => Box::new(p.args.iter().cloned()),
+        }
+    }
+
+    pub(crate) fn args_os(&self) -> Box<dyn Iterator<Item = OsString> + '_> {
+        match self {
+            Process::OSProcess(_) => Box::new(env::args_os()),
+            #[cfg(feature = "test")]
+            Process::TestProcess(p) => Box::new(p.args.iter().map(OsString::from)),
+        }
+    }
 }
 
 /// Obtain the current instance of CurrentProcess