fix: resolve conflict on unix

Author: Berrysoft

compio-driver/src/lib.rs

@@ -272,6 +272,12 @@ impl Proactor {
     }
 }
 
+impl AsRawFd for Proactor {
+    fn as_raw_fd(&self) -> RawFd {
+        self.driver.as_raw_fd()
+    }
+}
+
 /// An completed entry returned from kernel.
 #[derive(Debug)]
 pub(crate) struct Entry {

compio-fs/src/stdio/unix.rs

@@ -1,9 +1,8 @@
 use std::{io, mem::ManuallyDrop};
 
 use compio_buf::{BufResult, IoBuf, IoBufMut, IoVectoredBuf, IoVectoredBufMut};
-use compio_driver::{FromRawFd, RawFd};
+use compio_driver::{AsRawFd, FromRawFd, RawFd};
 use compio_io::{AsyncRead, AsyncWrite};
-use compio_runtime::TryAsRawFd;
 
 use crate::pipe::{Receiver, Sender};
 
@@ -31,13 +30,9 @@ impl AsyncRead for Stdin {
     }
 }
 
-impl TryAsRawFd for Stdin {
-    fn try_as_raw_fd(&self) -> io::Result<RawFd> {
-        self.0.try_as_raw_fd()
-    }
-
-    unsafe fn as_raw_fd_unchecked(&self) -> RawFd {
-        self.0.as_raw_fd_unchecked()
+impl AsRawFd for Stdin {
+    fn as_raw_fd(&self) -> RawFd {
+        self.0.as_raw_fd()
     }
 }
 
@@ -73,13 +68,9 @@ impl AsyncWrite for Stdout {
     }
 }
 
-impl TryAsRawFd for Stdout {
-    fn try_as_raw_fd(&self) -> io::Result<RawFd> {
-        self.0.try_as_raw_fd()
-    }
-
-    unsafe fn as_raw_fd_unchecked(&self) -> RawFd {
-        self.0.as_raw_fd_unchecked()
+impl AsRawFd for Stdout {
+    fn as_raw_fd(&self) -> RawFd {
+        self.0.as_raw_fd()
     }
 }
 
@@ -115,12 +106,8 @@ impl AsyncWrite for Stderr {
     }
 }
 
-impl TryAsRawFd for Stderr {
-    fn try_as_raw_fd(&self) -> io::Result<RawFd> {
-        self.0.try_as_raw_fd()
-    }
-
-    unsafe fn as_raw_fd_unchecked(&self) -> RawFd {
-        self.0.as_raw_fd_unchecked()
+impl AsRawFd for Stderr {
+    fn as_raw_fd(&self) -> RawFd {
+        self.0.as_raw_fd()
     }
 }

compio-runtime/src/runtime/mod.rs

@@ -10,7 +10,9 @@ use std::{
 
 use async_task::{Runnable, Task};
 use compio_buf::IntoInner;
-use compio_driver::{op::Asyncify, Key, OpCode, Proactor, ProactorBuilder, PushEntry, RawFd};
+use compio_driver::{
+    op::Asyncify, AsRawFd, Key, OpCode, Proactor, ProactorBuilder, PushEntry, RawFd,
+};
 use compio_log::{debug, instrument};
 use crossbeam_queue::SegQueue;
 use futures_util::{future::Either, FutureExt};
@@ -57,10 +59,6 @@ impl RuntimeInner {
         })
     }
 
-    pub fn id(&self) -> usize {
-        self.id
-    }
-
     // Safety: be careful about the captured lifetime.
     pub unsafe fn spawn_unchecked<F: Future>(&self, future: F) -> Task<F::Output> {
         let runnables = self.runnables.clone();
@@ -229,6 +227,12 @@ impl RuntimeInner {
     }
 }
 
+impl AsRawFd for RuntimeInner {
+    fn as_raw_fd(&self) -> RawFd {
+        self.driver.borrow().as_raw_fd()
+    }
+}
+
 struct RuntimeContext {
     depth: usize,
     ptr: Weak<RuntimeInner>,
@@ -408,6 +412,12 @@ impl Runtime {
     }
 }
 
+impl AsRawFd for Runtime {
+    fn as_raw_fd(&self) -> RawFd {
+        self.inner.as_raw_fd()
+    }
+}
+
 #[cfg(feature = "criterion")]
 impl criterion::async_executor::AsyncExecutor for Runtime {
     fn block_on<T>(&self, future: impl Future<Output = T>) -> T {