refactor: Remove unused traits

Author: epage

src/process/filesource.rs

@@ -1,7 +1,4 @@
-use std::io::{self, BufRead, Read, Write};
-
-use super::terminalsource::ColorableTerminal;
-use crate::process::Process;
+use std::io::{self, BufRead, Read};
 
 /// Stand-in for std::io::Stdin
 pub trait Stdin {
@@ -21,75 +18,13 @@ impl Stdin for io::Stdin {
     }
 }
 
-// -------------- stdout -------------------------------
-
-/// This is a stand-in for [`std::io::StdoutLock`] and [`std::io::StderrLock`].
-pub trait WriterLock: Write {}
-
-/// This is a stand-in for [`std::io::Stdout`] or [`std::io::Stderr`].
-/// TODO: remove Sync.
-pub trait Writer: Write + Send + Sync {
-    /// This is a stand-in for [`std::io::Stdout::lock`] or [`std::io::Stderr::lock`].
-    fn lock(&self) -> Box<dyn WriterLock + '_>;
-
-    /// Query whether a TTY is present. Used in download_tracker - we may want
-    /// to remove this entirely with a better progress bar system (in favour of
-    /// filtering in the Terminal layer?)
-    fn is_a_tty(&self, process: &Process) -> bool;
-
-    /// Construct a terminal on this writer.
-    fn terminal(&self, process: &Process) -> ColorableTerminal;
-}
-
-// ----------------- OS support for writers -----------------
-
-impl WriterLock for io::StdoutLock<'_> {}
-
-impl Writer for io::Stdout {
-    fn is_a_tty(&self, process: &Process) -> bool {
-        match process {
-            crate::process::Process::OsProcess(p) => p.stdout_is_a_tty,
-            #[cfg(feature = "test")]
-            crate::process::Process::TestProcess(_) => unreachable!(),
-        }
-    }
-
-    fn lock(&self) -> Box<dyn WriterLock + '_> {
-        Box::new(io::Stdout::lock(self))
-    }
-
-    fn terminal(&self, process: &Process) -> ColorableTerminal {
-        ColorableTerminal::stdout(process)
-    }
-}
-
-impl WriterLock for io::StderrLock<'_> {}
-
-impl Writer for io::Stderr {
-    fn is_a_tty(&self, process: &Process) -> bool {
-        match process {
-            crate::process::Process::OsProcess(p) => p.stderr_is_a_tty,
-            #[cfg(feature = "test")]
-            crate::process::Process::TestProcess(_) => unreachable!(),
-        }
-    }
-
-    fn lock(&self) -> Box<dyn WriterLock + '_> {
-        Box::new(io::Stderr::lock(self))
-    }
-
-    fn terminal(&self, process: &Process) -> ColorableTerminal {
-        ColorableTerminal::stderr(process)
-    }
-}
-
 #[cfg(feature = "test")]
 pub(crate) use self::test_support::*;
 
 #[cfg(feature = "test")]
 mod test_support {
     use std::{
-        io::Cursor,
+        io::{Cursor, Write},
         sync::{Arc, Mutex, MutexGuard},
     };
 
@@ -136,8 +71,6 @@ mod test_support {
         inner: MutexGuard<'a, Vec<u8>>,
     }
 
-    impl WriterLock for TestWriterLock<'_> {}
-
     impl Write for TestWriterLock<'_> {
         fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
             self.inner.write(buf)
@@ -164,20 +97,6 @@ mod test_support {
         }
     }
 
-    impl Writer for TestWriter {
-        fn is_a_tty(&self, _: &Process) -> bool {
-            false
-        }
-
-        fn lock(&self) -> Box<dyn WriterLock + '_> {
-            Box::new(self.lock())
-        }
-
-        fn terminal(&self, process: &Process) -> ColorableTerminal {
-            ColorableTerminal::test(self.clone(), process)
-        }
-    }
-
     impl Write for TestWriter {
         fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
             self.lock().write(buf)