Simplify process interface

Cargo.toml

@@ -50,7 +50,6 @@ clap_complete = "4"
 download = { path = "download", default-features = false }
 effective-limits = "0.5.5"
 enum-map = "2.5.0"
-enum_dispatch.workspace = true
 flate2 = "1"
 fs_at.workspace = true
 git-testament = "0.2"
@@ -134,7 +133,6 @@ members = ["download", "rustup-macros"]
 
 [workspace.dependencies]
 anyhow = "1.0.69"
-enum_dispatch = "0.3.11"
 fs_at = "0.1.6"
 once_cell = "1.18.0"
 opentelemetry = "0.23"

src/bin/rustup-init.rs

@@ -27,7 +27,7 @@ use rustup::cli::rustup_mode;
 #[cfg(windows)]
 use rustup::cli::self_update;
 use rustup::cli::setup_mode;
-use rustup::currentprocess::{process, varsource::VarSource, with_runtime, OSProcess};
+use rustup::currentprocess::{process, with_runtime, Process};
 use rustup::env_var::RUST_RECURSION_COUNT_MAX;
 use rustup::is_proxyable_tools;
 use rustup::utils::utils::{self, ExitCode};
@@ -36,10 +36,10 @@ fn main() {
     #[cfg(windows)]
     pre_rustup_main_init();
 
-    let process = OSProcess::default();
+    let process = Process::os();
     let mut builder = Builder::new_multi_thread();
     builder.enable_all();
-    with_runtime(process.into(), builder, {
+    with_runtime(process, builder, {
         async {
             match maybe_trace_rustup().await {
                 Err(e) => {

src/cli/common.rs

@@ -14,12 +14,7 @@ use once_cell::sync::Lazy;
 
 use super::self_update;
 use crate::cli::download_tracker::DownloadTracker;
-use crate::currentprocess::{
-    argsource::ArgSource,
-    filesource::{StdinSource, StdoutSource},
-    process, terminalsource,
-    varsource::VarSource,
-};
+use crate::currentprocess::{process, terminalsource};
 use crate::dist::dist::{TargetTriple, ToolchainDesc};
 use crate::dist::manifest::ComponentStatus;
 use crate::install::UpdateStatus;

src/cli/download_tracker.rs

@@ -4,7 +4,7 @@ use std::io::Write;
 use std::sync::{Arc, Mutex};
 use std::time::{Duration, Instant};
 
-use crate::currentprocess::{filesource::StdoutSource, process, terminalsource};
+use crate::currentprocess::{process, terminalsource};
 use crate::dist::Notification as In;
 use crate::notifications::Notification;
 use crate::utils::units::{Size, Unit, UnitMode};

src/cli/log.rs

@@ -1,9 +1,7 @@
 use std::fmt;
 use std::io::Write;
 
-use crate::currentprocess::{
-    filesource::StderrSource, process, terminalsource, varsource::VarSource,
-};
+use crate::currentprocess::{process, terminalsource};
 
 macro_rules! warn {
     ( $ ( $ arg : tt ) * ) => ( $crate::cli::log::warn_fmt ( format_args ! ( $ ( $ arg ) * ) ) )

src/cli/proxy_mode.rs

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

src/cli/rustup_mode.rs

@@ -24,8 +24,6 @@ use crate::{
     command,
     config::{new_toolchain_with_reason, ActiveReason, Cfg},
     currentprocess::{
-        argsource::ArgSource,
-        filesource::{StderrSource, StdoutSource},
         process,
         terminalsource::{self, ColorableTerminal},
     },
@@ -1490,8 +1488,6 @@ async fn man(
     command: &str,
     toolchain: Option<PartialToolchainDesc>,
 ) -> Result<utils::ExitCode> {
-    use crate::currentprocess::varsource::VarSource;
-
     let toolchain = Toolchain::from_partial(toolchain, cfg).await?;
     let mut path = toolchain.path().to_path_buf();
     path.push("share");
@@ -1513,7 +1509,8 @@ async fn man(
 
 fn set_auto_self_update(cfg: &mut Cfg, auto_self_update_mode: &str) -> Result<utils::ExitCode> {
     if self_update::NEVER_SELF_UPDATE {
-        let mut args = process().args_os();
+        let process = process();
+        let mut args = process.args_os();
         let arg0 = args.next().map(PathBuf::from);
         let arg0 = arg0
             .as_ref()

src/cli/self_update.rs

@@ -66,7 +66,7 @@ use crate::{
         markdown::md,
     },
     config::Cfg,
-    currentprocess::{filesource::StdoutSource, process, varsource::VarSource},
+    currentprocess::process,
     dist::dist::{self, PartialToolchainDesc, Profile, TargetTriple, ToolchainDesc},
     install::UpdateStatus,
     toolchain::{

src/cli/self_update/shell.rs

@@ -29,7 +29,7 @@ use std::path::PathBuf;
 use anyhow::{bail, Result};
 
 use super::utils;
-use crate::currentprocess::{process, varsource::VarSource};
+use crate::currentprocess::process;
 
 pub(crate) type Shell = Box<dyn UnixShell>;
 

src/cli/self_update/unix.rs

@@ -5,7 +5,7 @@ use anyhow::{bail, Context, Result};
 
 use super::install_bins;
 use super::shell;
-use crate::currentprocess::{process, varsource::VarSource};
+use crate::currentprocess::process;
 use crate::utils::utils;
 use crate::utils::Notification;
 

src/cli/self_update/windows.rs

@@ -12,7 +12,7 @@ use super::super::errors::*;
 use super::common;
 use super::{install_bins, InstallOpts};
 use crate::cli::download_tracker::DownloadTracker;
-use crate::currentprocess::{filesource::StdoutSource, process, varsource::VarSource};
+use crate::currentprocess::process;
 use crate::dist::dist::TargetTriple;
 use crate::utils::utils;
 use crate::utils::Notification;

src/cli/setup_mode.rs

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

src/config.rs

@@ -13,7 +13,7 @@ use tokio_stream::StreamExt;
 
 use crate::{
     cli::self_update::SelfUpdateMode,
-    currentprocess::{process, varsource::VarSource},
+    currentprocess::process,
     dist::{
         dist::{self, PartialToolchainDesc, Profile, ToolchainDesc},
         download::DownloadCfg,