Simplify process access to pid

Author: djc

src/currentprocess.rs

@@ -65,11 +65,11 @@ use crate::utils::tty::{stderr_isatty, stdout_isatty};
 /// 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 + ProcessSource + Debug {}
+pub trait CurrentProcess: home::Env + CurrentDirSource + VarSource + Debug {}
 
 /// Allows concrete types for the currentprocess abstraction.
 #[derive(Clone, Debug)]
-#[enum_dispatch(CurrentProcess, CurrentDirSource, VarSource, ProcessSource)]
+#[enum_dispatch(CurrentProcess, CurrentDirSource, VarSource)]
 pub enum Process {
     OSProcess(OSProcess),
     #[cfg(feature = "test")]
@@ -129,6 +129,15 @@ impl Process {
             Process::TestProcess(p) => Box::new(filesource::TestWriter(p.stderr.clone())),
         }
     }
+
+    #[cfg(test)]
+    fn id(&self) -> u64 {
+        match self {
+            Process::OSProcess(_) => std::process::id() as u64,
+            #[cfg(feature = "test")]
+            Process::TestProcess(p) => p.id,
+        }
+    }
 }
 
 /// Obtain the current instance of CurrentProcess
@@ -182,16 +191,6 @@ thread_local! {
     pub(crate) static PROCESS: RefCell<Option<Process>> = const { RefCell::new(None) };
 }
 
-// PID related things
-#[enum_dispatch]
-pub trait ProcessSource {
-    /// Returns a unique id for the process.
-    ///
-    /// Real process ids are <= u32::MAX.
-    /// Test process ids are > u32::MAX
-    fn id(&self) -> u64;
-}
-
 // ----------- real process -----------------
 
 #[derive(Clone, Debug)]
@@ -215,12 +214,6 @@ impl Default for OSProcess {
     }
 }
 
-impl ProcessSource for OSProcess {
-    fn id(&self) -> u64 {
-        std::process::id() as u64
-    }
-}
-
 // ------------ test process ----------------
 #[cfg(feature = "test")]
 #[derive(Clone, Debug, Default)]
@@ -276,21 +269,14 @@ impl TestProcess {
     }
 }
 
-#[cfg(feature = "test")]
-impl ProcessSource for TestProcess {
-    fn id(&self) -> u64 {
-        self.id
-    }
-}
-
 #[cfg(test)]
 mod tests {
     use std::collections::HashMap;
     use std::env;
 
     use rustup_macros::unit_test as test;
 
-    use super::{process, with, ProcessSource, TestProcess};
+    use super::{process, with, TestProcess};
 
     #[test]
     fn test_instance() {
@@ -301,7 +287,7 @@ mod tests {
             "",
         );
         with(proc.clone().into(), || {
-            assert_eq!(proc.id(), process().id(), "{:?} != {:?}", proc, process())
+            assert_eq!(proc.id, process().id(), "{:?} != {:?}", proc, process())
         });
     }
 }