Simplify process access to stderr

Author: djc

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, varsource::VarSource};
 
 macro_rules! warn {
     ( $ ( $ arg : tt ) * ) => ( $crate::cli::log::warn_fmt ( format_args ! ( $ ( $ arg ) * ) ) )

src/cli/rustup_mode.rs

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

src/currentprocess.rs

@@ -66,13 +66,7 @@ use varsource::*;
 /// and even there we should be doing debouncing and managing update rates).
 #[enum_dispatch]
 pub trait CurrentProcess:
-    home::Env
-    + CurrentDirSource
-    + VarSource
-    + StderrSource
-    + StdinSource
-    + ProcessSource
-    + Debug
+    home::Env + CurrentDirSource + VarSource + StdinSource + ProcessSource + Debug
 {
 }
 
@@ -82,7 +76,6 @@ pub trait CurrentProcess:
     CurrentProcess,
     CurrentDirSource,
     VarSource,
-    StderrSource,
     StdinSource,
     ProcessSource
 )]
@@ -129,6 +122,14 @@ impl Process {
             Process::TestProcess(p) => Box::new(filesource::TestWriter(p.stdout.clone())),
         }
     }
+
+    pub(crate) fn stderr(&self) -> Box<dyn filesource::Writer> {
+        match self {
+            Process::OSProcess(_) => Box::new(io::stderr()),
+            #[cfg(feature = "test")]
+            Process::TestProcess(p) => Box::new(filesource::TestWriter(p.stderr.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;
 }
 
-// -------------- stderr -------------------------------
-
-/// Stand-in for std::io::stderr.
-#[enum_dispatch]
-pub trait StderrSource {
-    fn stderr(&self) -> Box<dyn Writer>;
-}
-
 // ----------------- OS support for writers -----------------
 
 impl WriterLock for io::StdoutLock<'_> {}
@@ -110,12 +102,6 @@ impl Writer for io::Stderr {
     }
 }
 
-impl StderrSource for super::OSProcess {
-    fn stderr(&self) -> Box<dyn Writer> {
-        Box::new(io::stderr())
-    }
-}
-
 #[cfg(feature = "test")]
 pub(crate) use self::test_support::*;
 
@@ -229,10 +215,4 @@ mod test_support {
             Ok(())
         }
     }
-
-    impl StderrSource for TestProcess {
-        fn stderr(&self) -> Box<dyn Writer> {
-            Box::new(TestWriter(self.stderr.clone()))
-        }
-    }
 }

src/dist/component/package.rs

@@ -11,7 +11,7 @@ use std::path::{Path, PathBuf};
 use anyhow::{anyhow, bail, Context, Result};
 use tar::EntryType;
 
-use crate::currentprocess::{filesource::StderrSource, process, varsource::VarSource};
+use crate::currentprocess::{process, varsource::VarSource};
 use crate::diskio::{get_executor, CompletedIo, Executor, FileBuffer, Item, Kind, IO_CHUNK_SIZE};
 use crate::dist::component::components::*;
 use crate::dist::component::transaction::*;