Simplify process access to stdout

Author: djc

src/cli/common.rs

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

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/rustup_mode.rs

@@ -24,7 +24,7 @@ use crate::{
     command,
     config::{new_toolchain_with_reason, ActiveReason, Cfg},
     currentprocess::{
-        filesource::{StderrSource, StdoutSource},
+        filesource::StderrSource,
         process,
         terminalsource::{self, ColorableTerminal},
     },

src/cli/self_update.rs

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

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, varsource::VarSource};
 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/currentprocess.rs

@@ -69,7 +69,6 @@ pub trait CurrentProcess:
     home::Env
     + CurrentDirSource
     + VarSource
-    + StdoutSource
     + StderrSource
     + StdinSource
     + ProcessSource
@@ -83,7 +82,6 @@ pub trait CurrentProcess:
     CurrentProcess,
     CurrentDirSource,
     VarSource,
-    StdoutSource,
     StderrSource,
     StdinSource,
     ProcessSource
@@ -123,6 +121,14 @@ impl Process {
             Process::TestProcess(p) => Box::new(p.args.iter().map(OsString::from)),
         }
     }
+
+    pub(crate) fn stdout(&self) -> Box<dyn filesource::Writer> {
+        match self {
+            Process::OSProcess(_) => Box::new(io::stdout()),
+            #[cfg(feature = "test")]
+            Process::TestProcess(p) => Box::new(filesource::TestWriter(p.stdout.clone())),
+        }
+    }
 }
 
 /// Obtain the current instance of CurrentProcess

src/currentprocess/filesource.rs

@@ -60,14 +60,6 @@ pub trait Writer: Write + Send + Sync {
     fn terminal(&self) -> ColorableTerminal;
 }
 
-// -------------- stdout -------------------------------
-
-/// Stand-in for [`std::io::stdout`].
-#[enum_dispatch]
-pub trait StdoutSource {
-    fn stdout(&self) -> Box<dyn Writer>;
-}
-
 // -------------- stderr -------------------------------
 
 /// Stand-in for std::io::stderr.
@@ -98,12 +90,6 @@ impl Writer for io::Stdout {
     }
 }
 
-impl StdoutSource for super::OSProcess {
-    fn stdout(&self) -> Box<dyn Writer> {
-        Box::new(io::stdout())
-    }
-}
-
 impl WriterLock for io::StderrLock<'_> {}
 
 impl Writer for io::Stderr {
@@ -208,7 +194,7 @@ mod test_support {
 
     /// A thread-safe test file handle that pretends to be e.g. stdout.
     #[derive(Clone, Default)]
-    pub(in super::super) struct TestWriter(TestWriterInner);
+    pub(in super::super) struct TestWriter(pub(in super::super) TestWriterInner);
 
     impl TestWriter {
         pub(in super::super) fn lock(&self) -> TestWriterLock<'_> {
@@ -244,12 +230,6 @@ mod test_support {
         }
     }
 
-    impl StdoutSource for TestProcess {
-        fn stdout(&self) -> Box<dyn Writer> {
-            Box::new(TestWriter(self.stdout.clone()))
-        }
-    }
-
     impl StderrSource for TestProcess {
         fn stderr(&self) -> Box<dyn Writer> {
             Box::new(TestWriter(self.stderr.clone()))