1 files changed, 26 insertions, 5 deletions

diff --git a/crates/stdx/src/lib.rs b/crates/stdx/src/lib.rs
index d26be4853..857567a85 100644
--- a/crates/stdx/src/lib.rs
+++ b/crates/stdx/src/lib.rs
@@ -1,7 +1,8 @@
 //! Missing batteries for standard libraries.
-use std::{cmp::Ordering, ops, process, time::Instant};
+use std::{cmp::Ordering, ops, time::Instant};
 
 mod macros;
+pub mod process;
 pub mod panic_context;
 
 pub use always_assert::{always, never};
@@ -178,17 +179,30 @@ where
     start..start + len
 }
 
-pub struct JodChild(pub process::Child);
+pub fn defer<F: FnOnce()>(f: F) -> impl Drop {
+    struct D<F: FnOnce()>(Option<F>);
+    impl<F: FnOnce()> Drop for D<F> {
+        fn drop(&mut self) {
+            if let Some(f) = self.0.take() {
+                f()
+            }
+        }
+    }
+    D(Some(f))
+}
+
+#[repr(transparent)]
+pub struct JodChild(pub std::process::Child);
 
 impl ops::Deref for JodChild {
-    type Target = process::Child;
-    fn deref(&self) -> &process::Child {
+    type Target = std::process::Child;
+    fn deref(&self) -> &std::process::Child {
         &self.0
     }
 }
 
 impl ops::DerefMut for JodChild {
-    fn deref_mut(&mut self) -> &mut process::Child {
+    fn deref_mut(&mut self) -> &mut std::process::Child {
         &mut self.0
     }
 }
@@ -200,6 +214,13 @@ impl Drop for JodChild {
     }
 }
 
+impl JodChild {
+    pub fn into_inner(self) -> std::process::Child {
+        // SAFETY: repr transparent
+        unsafe { std::mem::transmute::<JodChild, std::process::Child>(self) }
+    }
+}
+
 #[cfg(test)]
 mod tests {
     use super::*;