From e1d1fe7fda34eb8bb7f1ba722c840008e27fcefe Mon Sep 17 00:00:00 2001
From: Julian Orth <ju.orth@gmail.com>
Date: Sat, 7 Sep 2024 17:02:28 +0200
Subject: [PATCH] util: add OnDrop2 for non-copy closures

---
 src/utils/on_drop.rs | 33 ++++++++++++++++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/utils/on_drop.rs b/src/utils/on_drop.rs
index a7a12d79..15557f0a 100644
--- a/src/utils/on_drop.rs
+++ b/src/utils/on_drop.rs
@@ -1,4 +1,4 @@
-use std::mem;
+use std::{mem, mem::ManuallyDrop};
 
 pub struct OnDrop<F>(pub F)
 where
@@ -15,3 +15,34 @@ impl<F: FnMut() + Copy> Drop for OnDrop<F> {
         (self.0)();
     }
 }
+
+pub struct OnDrop2<F>
+where
+    F: FnOnce(),
+{
+    f: ManuallyDrop<F>,
+}
+
+impl<F: FnOnce()> OnDrop2<F> {
+    #[expect(dead_code)]
+    pub fn new(f: F) -> Self {
+        Self {
+            f: ManuallyDrop::new(f),
+        }
+    }
+
+    #[expect(dead_code)]
+    pub fn forget(mut self) {
+        unsafe {
+            ManuallyDrop::drop(&mut self.f);
+        }
+        mem::forget(self);
+    }
+}
+
+impl<F: FnOnce()> Drop for OnDrop2<F> {
+    fn drop(&mut self) {
+        let f = unsafe { ManuallyDrop::take(&mut self.f) };
+        f();
+    }
+}