chore: Review comments

Signed-off-by: John Nunley <dev@notgull.net>

src/lib.rs

@@ -166,11 +166,6 @@ impl Reaper {
             .expect("cannot spawn async-process thread");
     }
 
-    /// Reap zombie processes forever.
-    async fn reap(&'static self, driver_guard: reaper::Lock) -> ! {
-        self.sys.reap(driver_guard).await
-    }
-
     /// Register a process with this reaper.
     fn register(&'static self, child: std::process::Child) -> io::Result<reaper::ChildGuard> {
         self.ensure_driven();
@@ -717,16 +712,9 @@ impl TryFrom<ChildStderr> for OwnedFd {
 /// }).await;
 /// # });
 /// ```
+#[allow(clippy::manual_async_fn)]
 #[inline]
 pub fn driver() -> impl Future<Output = Infallible> + Send + 'static {
-    struct CallOnDrop<F: FnMut()>(F);
-
-    impl<F: FnMut()> Drop for CallOnDrop<F> {
-        fn drop(&mut self) {
-            (self.0)();
-        }
-    }
-
     async {
         // Get the reaper.
         let reaper = Reaper::get();
@@ -749,7 +737,7 @@ pub fn driver() -> impl Future<Output = Infallible> + Send + 'static {
 
         // Acquire the reaper lock and start polling the SIGCHLD event.
         let guard = reaper.sys.lock().await;
-        reaper.reap(guard).await
+        reaper.sys.reap(guard).await
     }
 }
 
@@ -1147,6 +1135,14 @@ fn blocking_fd(fd: rustix::fd::BorrowedFd<'_>) -> io::Result<()> {
     Ok(())
 }
 
+struct CallOnDrop<F: FnMut()>(F);
+
+impl<F: FnMut()> Drop for CallOnDrop<F> {
+    fn drop(&mut self) {
+        (self.0)();
+    }
+}
+
 #[cfg(test)]
 mod test {
     #[test]

src/reaper/wait.rs

@@ -97,14 +97,6 @@ impl ChildGuard {
 
     /// Begin the reaping process for this child.
     pub(crate) fn reap(&mut self, reaper: &'static Reaper) {
-        struct CallOnDrop<F: FnMut()>(F);
-
-        impl<F: FnMut()> Drop for CallOnDrop<F> {
-            fn drop(&mut self) {
-                (self.0)();
-            }
-        }
-
         // Create a future for polling this child.
         let future = {
             let mut inner = self.inner.take().unwrap();
@@ -113,14 +105,14 @@ impl ChildGuard {
                 reaper.zombies.fetch_add(1, Ordering::Relaxed);
 
                 // Decrement the zombie count once we are done.
-                let _guard = CallOnDrop(|| {
+                let _guard = crate::CallOnDrop(|| {
                     reaper.zombies.fetch_sub(1, Ordering::SeqCst);
                 });
 
                 // Wait on this child forever.
                 let result = future::poll_fn(|cx| inner.poll_wait(cx)).await;
                 if let Err(e) = result {
-                    tracing::error!("error while polling zombie process: {}", e);
+                   tracing::error!("error while polling zombie process: {}", e);
                 }
             }
         };