Simplify process access to stdout

Author: djc

src/cli/common.rs

@@ -14,11 +14,7 @@ use once_cell::sync::Lazy;
 
 use super::self_update;
 use crate::cli::download_tracker::DownloadTracker;
-use crate::currentprocess::{
-    filesource::{StdinSource, StdoutSource},
-    terminalsource,
-    varsource::VarSource,
-};
+use crate::currentprocess::{filesource::StdinSource, terminalsource, varsource::VarSource};
 use crate::dist::dist::{TargetTriple, ToolchainDesc};
 use crate::install::UpdateStatus;
 use crate::utils::notifications as util_notifications;

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::utils::units::{Size, Unit, UnitMode};
 use crate::utils::Notification as Un;

src/cli/rustup_mode.rs

@@ -20,7 +20,7 @@ use crate::{
         topical_doc,
     },
     command,
-    currentprocess::filesource::{StderrSource, StdoutSource},
+    currentprocess::filesource::StderrSource,
     dist::{
         dist::{PartialToolchainDesc, Profile, TargetTriple},
         manifest::{Component, ComponentStatus},

src/cli/self_update.rs

@@ -65,7 +65,7 @@ use crate::{
         errors::*,
         markdown::md,
     },
-    currentprocess::{filesource::StdoutSource, varsource::VarSource},
+    currentprocess::varsource::VarSource,
     dist::dist::{self, PartialToolchainDesc, Profile, TargetTriple, ToolchainDesc},
     install::UpdateStatus,
     process,

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, varsource::VarSource};
+use crate::currentprocess::varsource::VarSource;
 use crate::dist::dist::TargetTriple;
 use crate::process;
 use crate::utils::utils;

src/cli/setup_mode.rs

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

src/currentprocess.rs

@@ -68,7 +68,6 @@ pub trait CurrentProcess:
     home::Env
     + CurrentDirSource
     + VarSource
-    + StdoutSource
     + StderrSource
     + StdinSource
     + ProcessSource
@@ -82,7 +81,6 @@ pub trait CurrentProcess:
     CurrentProcess,
     CurrentDirSource,
     VarSource,
-    StdoutSource,
     StderrSource,
     StdinSource,
     ProcessSource
@@ -122,6 +120,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

@@ -107,14 +107,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.
@@ -145,12 +137,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 {
@@ -200,7 +186,7 @@ pub(super) type TestWriterInner = Arc<Mutex<Vec<u8>>>;
 /// A thread-safe test file handle that pretends to be e.g. stdout.
 #[derive(Clone, Default)]
 #[cfg(feature = "test")]
-pub(super) struct TestWriter(TestWriterInner);
+pub(super) struct TestWriter(pub(super) TestWriterInner);
 
 #[cfg(feature = "test")]
 impl TestWriter {
@@ -239,13 +225,6 @@ impl Write for TestWriter {
     }
 }
 
-#[cfg(feature = "test")]
-impl StdoutSource for super::TestProcess {
-    fn stdout(&self) -> Box<dyn Writer> {
-        Box::new(TestWriter(self.stdout.clone()))
-    }
-}
-
 #[cfg(feature = "test")]
 impl StderrSource for super::TestProcess {
     fn stderr(&self) -> Box<dyn Writer> {