chore: apply clippy

Author: harryplusplus

crates/libs/kill_tree/src/blocking.rs

@@ -1,4 +1,4 @@
-use crate::core::{Config, Outputs, ProcessId, Result};
+use crate::core::{blocking::ProcessInfosProvidable, Config, Outputs, ProcessId, Result};
 
 #[cfg(target_os = "linux")]
 use crate::linux as imp;
@@ -125,6 +125,7 @@ pub fn kill_tree(process_id: ProcessId) -> Result<Outputs> {
 /// ```
 pub fn kill_tree_with_config(process_id: ProcessId, config: &Config) -> Result<Outputs> {
     imp::validate_process_id(process_id)?;
-    let process_infos = imp::blocking::get_process_infos()?;
+    let process_infos_provider = imp::blocking::ProcessInfosProvider {};
+    let process_infos = process_infos_provider.get_process_infos()?;
     crate::common::kill_tree_internal(process_id, config, process_infos)
 }

crates/libs/kill_tree/src/core.rs

@@ -20,7 +20,7 @@ pub enum Error {
     #[cfg(unix)]
     Unix(nix::Error),
     #[cfg(feature = "tokio")]
-    TokioJoin(tokio::task::JoinError),
+    TokioJoin(::tokio::task::JoinError),
 }
 
 impl std::fmt::Display for Error {
@@ -127,3 +127,27 @@ impl Default for Config {
         }
     }
 }
+
+#[cfg(feature = "blocking")]
+pub(crate) mod blocking {
+    use super::{ProcessInfos, Result};
+
+    pub(crate) trait ProcessInfosProvidable {
+        fn get_process_infos(&self) -> Result<ProcessInfos>;
+    }
+}
+
+#[cfg(feature = "tokio")]
+pub(crate) mod tokio {
+    use super::{Error, ProcessInfos, Result};
+
+    impl From<::tokio::task::JoinError> for Error {
+        fn from(e: ::tokio::task::JoinError) -> Self {
+            Error::TokioJoin(e)
+        }
+    }
+
+    pub(crate) trait ProcessInfosProvidable {
+        async fn get_process_infos(&self) -> Result<ProcessInfos>;
+    }
+}

crates/libs/kill_tree/src/tokio.rs

@@ -1,4 +1,4 @@
-use crate::core::{Config, Error, Outputs, ProcessId, Result};
+use crate::core::{tokio::ProcessInfosProvidable, Config, Outputs, ProcessId, Result};
 
 #[cfg(target_os = "linux")]
 use crate::linux as imp;
@@ -7,12 +7,6 @@ use crate::macos as imp;
 #[cfg(windows)]
 use crate::windows as imp;
 
-impl From<tokio::task::JoinError> for Error {
-    fn from(e: tokio::task::JoinError) -> Self {
-        Error::TokioJoin(e)
-    }
-}
-
 /// Returns the max available process ID.
 /// # Platform-specifics
 /// ## Windows
@@ -119,6 +113,7 @@ pub async fn kill_tree(process_id: ProcessId) -> Result<Outputs> {
 /// ```
 pub async fn kill_tree_with_config(process_id: ProcessId, config: &Config) -> Result<Outputs> {
     imp::validate_process_id(process_id)?;
-    let process_infos = imp::tokio::get_process_infos().await?;
+    let process_infos_provider = imp::tokio::ProcessInfosProvider {};
+    let process_infos = process_infos_provider.get_process_infos().await?;
     crate::common::kill_tree_internal(process_id, config, process_infos)
 }

crates/libs/kill_tree/src/windows.rs

@@ -169,17 +169,27 @@ pub(crate) fn get_process_infos() -> Result<ProcessInfos> {
 #[cfg(feature = "blocking")]
 pub(crate) mod blocking {
     use super::{ProcessInfos, Result};
+    use crate::core::blocking::ProcessInfosProvidable;
 
-    pub(crate) fn get_process_infos() -> Result<ProcessInfos> {
-        crate::windows::get_process_infos()
+    pub(crate) struct ProcessInfosProvider {}
+
+    impl ProcessInfosProvidable for ProcessInfosProvider {
+        fn get_process_infos(&self) -> Result<ProcessInfos> {
+            crate::windows::get_process_infos()
+        }
     }
 }
 
 #[cfg(feature = "tokio")]
 pub(crate) mod tokio {
     use super::{ProcessInfos, Result};
+    use crate::core::tokio::ProcessInfosProvidable;
 
-    pub(crate) async fn get_process_infos() -> Result<ProcessInfos> {
-        crate::windows::get_process_infos()
+    pub(crate) struct ProcessInfosProvider {}
+
+    impl ProcessInfosProvidable for ProcessInfosProvider {
+        async fn get_process_infos(&self) -> Result<ProcessInfos> {
+            crate::windows::get_process_infos()
+        }
     }
 }