Simplify process access to stdin

Author: djc

src/cli/common.rs

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

src/currentprocess.rs

@@ -27,7 +27,6 @@ pub mod terminalsource;
 pub mod varsource;
 
 use cwdsource::*;
-use filesource::*;
 use varsource::*;
 
 /// An abstraction for the current process.
@@ -65,20 +64,11 @@ use varsource::*;
 /// methods are in performance critical loops (except perhaps progress bars -
 /// and even there we should be doing debouncing and managing update rates).
 #[enum_dispatch]
-pub trait CurrentProcess:
-    home::Env + CurrentDirSource + VarSource + StdinSource + ProcessSource + Debug
-{
-}
+pub trait CurrentProcess: home::Env + CurrentDirSource + VarSource + ProcessSource + Debug {}
 
 /// Allows concrete types for the currentprocess abstraction.
 #[derive(Clone, Debug)]
-#[enum_dispatch(
-    CurrentProcess,
-    CurrentDirSource,
-    VarSource,
-    StdinSource,
-    ProcessSource
-)]
+#[enum_dispatch(CurrentProcess, CurrentDirSource, VarSource, ProcessSource)]
 pub enum Process {
     OSProcess(OSProcess),
     #[cfg(feature = "test")]
@@ -115,6 +105,14 @@ impl Process {
         }
     }
 
+    pub(crate) fn stdin(&self) -> Box<dyn filesource::Stdin> {
+        match self {
+            Process::OSProcess(_) => Box::new(io::stdin()),
+            #[cfg(feature = "test")]
+            Process::TestProcess(p) => Box::new(filesource::TestStdin(p.stdin.clone())),
+        }
+    }
+
     pub(crate) fn stdout(&self) -> Box<dyn filesource::Writer> {
         match self {
             Process::OSProcess(_) => Box::new(io::stdout()),
@@ -296,9 +294,9 @@ pub struct TestProcess {
     pub args: Vec<String>,
     pub vars: HashMap<String, String>,
     pub id: u64,
-    pub stdin: TestStdinInner,
-    pub stdout: TestWriterInner,
-    pub stderr: TestWriterInner,
+    pub stdin: filesource::TestStdinInner,
+    pub stdout: filesource::TestWriterInner,
+    pub stderr: filesource::TestWriterInner,
 }
 
 #[cfg(feature = "test")]

src/currentprocess/filesource.rs

@@ -1,7 +1,5 @@
 use std::io::{self, BufRead, Read, Result, Write};
 
-use enum_dispatch::enum_dispatch;
-
 use super::terminalsource::{ColorableTerminal, StreamSelector};
 use crate::currentprocess::process;
 
@@ -14,12 +12,6 @@ pub trait Stdin {
 /// Stand-in for std::io::StdinLock
 pub trait StdinLock: Read + BufRead {}
 
-/// Stand-in for std::io::stdin
-#[enum_dispatch]
-pub trait StdinSource {
-    fn stdin(&self) -> Box<dyn Stdin>;
-}
-
 // ----------------- OS support for stdin -----------------
 
 impl StdinLock for io::StdinLock<'_> {}
@@ -34,12 +26,6 @@ impl Stdin for io::Stdin {
     }
 }
 
-impl StdinSource for super::OSProcess {
-    fn stdin(&self) -> Box<dyn Stdin> {
-        Box::new(io::stdin())
-    }
-}
-
 // -------------- stdout -------------------------------
 
 /// This is a stand-in for [`std::io::StdoutLock`] and [`std::io::StderrLock`].
@@ -112,7 +98,7 @@ mod test_support {
         sync::{Arc, Mutex, MutexGuard},
     };
 
-    use super::{super::TestProcess, *};
+    use super::*;
 
     // ----------------------- test support for stdin ------------------
 
@@ -139,7 +125,7 @@ mod test_support {
 
     pub(crate) type TestStdinInner = Arc<Mutex<Cursor<String>>>;
 
-    struct TestStdin(TestStdinInner);
+    pub struct TestStdin(pub(in super::super) TestStdinInner);
 
     impl Stdin for TestStdin {
         fn lock(&self) -> Box<dyn StdinLock + '_> {
@@ -152,12 +138,6 @@ mod test_support {
         }
     }
 
-    impl StdinSource for TestProcess {
-        fn stdin(&self) -> Box<dyn Stdin> {
-            Box::new(TestStdin(self.stdin.clone()))
-        }
-    }
-
     // ----------------------- test support for writers ------------------
 
     pub(in super::super) struct TestWriterLock<'a> {