From a0a948101da274493247c7e4d4512ea5a8f1e1ca Mon Sep 17 00:00:00 2001
From: PThorpe92 <preston@turso.tech>
Date: Thu, 17 Jul 2025 23:47:43 -0400
Subject: [PATCH] Last cleanups of old completion api

---
 core/io/io_uring.rs                              | 12 +++++-------
 tests/integration/query_processing/test_btree.rs |  4 +---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/core/io/io_uring.rs b/core/io/io_uring.rs
index e204e044c..c09ef895d 100644
--- a/core/io/io_uring.rs
+++ b/core/io/io_uring.rs
@@ -343,13 +343,11 @@ impl File for UringFile {
         let c_uring = c.clone();
         io.ring.submit_entry(
             &write,
-            Arc::new(Completion::new(CompletionType::Write(
-                WriteCompletion::new(Box::new(move |result| {
-                    c_uring.complete(result);
-                    // NOTE: Explicitly reference buffer to ensure it lives until here
-                    let _ = buffer.borrow();
-                })),
-            ))),
+            Arc::new(Completion::new_write(move |result| {
+                c_uring.complete(result);
+                // NOTE: Explicitly reference buffer to ensure it lives until here
+                let _ = buffer.borrow();
+            })),
         );
         Ok(c)
     }
diff --git a/tests/integration/query_processing/test_btree.rs b/tests/integration/query_processing/test_btree.rs
index 705557687..a3c7edc56 100644
--- a/tests/integration/query_processing/test_btree.rs
+++ b/tests/integration/query_processing/test_btree.rs
@@ -431,9 +431,7 @@ impl BTreeGenerator<'_> {
 }
 
 fn write_at(io: &impl IO, file: Arc<dyn File>, offset: usize, data: &[u8]) {
-    let completion = Completion::new(CompletionType::Write(WriteCompletion::new(Box::new(
-        |_| {},
-    ))));
+    let completion = Completion::new_write(|_| {});
     let drop_fn = Rc::new(move |_| {});
     #[allow(clippy::arc_with_non_send_sync)]
     let buffer = Arc::new(RefCell::new(Buffer::new(Pin::new(data.to_vec()), drop_fn)));