refactor: remove redundant methods and ctor args

Author: Sherlock-Holo

compio-driver/src/iour/mod.rs

@@ -247,7 +247,7 @@ impl Driver {
                 let mut op = unsafe { Key::<dyn crate::sys::OpCode>::new_unchecked(user_data) };
                 let op_pin = op.as_op_pin();
                 let res = op_pin.call_blocking();
-                completed.push(Entry::new(user_data, res, todo!("how to get flags?")));
+                completed.push(Entry::new(user_data, res));
                 handle.notify().ok();
             })
             .is_ok();
@@ -282,8 +282,8 @@ impl AsRawFd for Driver {
     }
 }
 
-fn create_entry(entry: CEntry) -> Entry {
-    let result = entry.result();
+fn create_entry(cq_entry: CEntry) -> Entry {
+    let result = cq_entry.result();
     let result = if result < 0 {
         let result = if result == -libc::ECANCELED {
             libc::ETIMEDOUT
@@ -294,7 +294,10 @@ fn create_entry(entry: CEntry) -> Entry {
     } else {
         Ok(result as _)
     };
-    Entry::new(entry.user_data() as _, result, entry.flags())
+    let mut entry = Entry::new(cq_entry.user_data() as _, result);
+    entry.set_flags(entry.flags());
+
+    entry
 }
 
 fn timespec(duration: std::time::Duration) -> Timespec {

compio-driver/src/key.rs

@@ -160,6 +160,10 @@ impl<T: ?Sized> Key<T> {
         self.as_opaque_mut().flags = flags;
     }
 
+    pub(crate) fn flags(&self) -> u32 {
+        self.as_opaque().flags
+    }
+
     /// Whether the op is completed.
     pub(crate) fn has_result(&self) -> bool {
         self.as_opaque().result.is_ready()
@@ -195,19 +199,6 @@ impl<T> Key<T> {
         let op = unsafe { Box::from_raw(self.user_data as *mut RawOp<T>) };
         BufResult(op.result.take_ready().unwrap_unchecked(), op.op)
     }
-
-    /// Get the inner result and flags if it is completed.
-    ///
-    /// # Safety
-    ///
-    /// Call it only when the op is completed, otherwise it is UB.
-    pub(crate) unsafe fn into_inner_flags(self) -> (BufResult<usize, T>, u32) {
-        let op = unsafe { Box::from_raw(self.user_data as *mut RawOp<T>) };
-        (
-            BufResult(op.result.take_ready().unwrap_unchecked(), op.op),
-            op.flags,
-        )
-    }
 }
 
 impl<T: OpCode + ?Sized> Key<T> {

compio-driver/src/lib.rs

@@ -308,8 +308,9 @@ impl Proactor {
     pub fn pop_flags<T>(&mut self, op: Key<T>) -> PushEntry<Key<T>, (BufResult<usize, T>, u32)> {
         instrument!(compio_log::Level::DEBUG, "pop_flags", ?op);
         if op.has_result() {
+            let flags = op.flags();
             // SAFETY: completed.
-            PushEntry::Ready(unsafe { op.into_inner_flags() })
+            PushEntry::Ready((unsafe { op.into_inner() }, flags))
         } else {
             PushEntry::Pending(op)
         }
@@ -341,14 +342,18 @@ pub(crate) struct Entry {
 }
 
 impl Entry {
-    pub(crate) fn new(user_data: usize, result: io::Result<usize>, flags: u32) -> Self {
+    pub(crate) fn new(user_data: usize, result: io::Result<usize>) -> Self {
         Self {
             user_data,
             result,
-            flags,
+            flags: 0,
         }
     }
 
+    pub(crate) fn set_flags(&mut self, flags: u32) {
+        self.flags = flags;
+    }
+
     /// The user-defined data returned by [`Proactor::push`].
     pub fn user_data(&self) -> usize {
         self.user_data