deps: bump mio-rs to 1.1.0

Cargo.toml

@@ -23,7 +23,7 @@ rust-version = "1.70"
 
 [dependencies]
 lockfree = "0.5.1"
-mio = { version = "1.0.3", features = ["os-poll", "net"] }
+mio = { version = "1.1.0", features = ["os-poll", "net"] }
 
 [dev-dependencies]
 serde ={ version = "1.0.219", features = ["derive"] }

examples/echo_server.rs

@@ -1,5 +1,6 @@
-use mill_io::{error::Result, event::Event, EventHandler, EventLoop, ObjectPool, PooledObject};
+use mill_io::{error::Result, EventHandler, EventLoop, ObjectPool, PooledObject};
 use mio::{
+    event::Event,
     net::{TcpListener, TcpStream},
     Interest, Token,
 };

examples/file_watcher.rs

@@ -1,5 +1,5 @@
-use mill_io::{error::Result, event::Event, EventHandler, EventLoop};
-use mio::Token;
+use mill_io::{error::Result, EventHandler, EventLoop};
+use mio::{event::Event, Token};
 use std::{
     collections::HashMap,
     env,

examples/http_server.rs

@@ -1,5 +1,6 @@
-use mill_io::{error::Result, event::Event, EventHandler, EventLoop, ObjectPool, PooledObject};
+use mill_io::{error::Result, EventHandler, EventLoop, ObjectPool, PooledObject};
 use mio::{
+    event::Event,
     net::{TcpListener, TcpStream},
     Interest, Token,
 };

examples/jsonrpc-server.rs

@@ -1,5 +1,5 @@
-use mill_io::{error::Result, event::Event, EventHandler, EventLoop, ObjectPool, PooledObject};
-use mio::{net::TcpListener, Interest, Token};
+use mill_io::{error::Result, EventHandler, EventLoop, ObjectPool, PooledObject};
+use mio::{event::Event, net::TcpListener, Interest, Token};
 use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,

src/handler.rs

@@ -1,5 +1,4 @@
-use crate::event::Event;
-use mio::Interest;
+use mio::{event::Event, Interest};
 
 pub trait EventHandler {
     fn handle_event(&self, event: &Event);

src/lib.rs

@@ -31,8 +31,8 @@
 //! ## Quick Start
 //!
 //! ```rust,no_run
-//! use mill_io::{EventLoop, EventHandler, event::Event};
-//! use mio::{net::TcpListener, Interest, Token};
+//! use mill_io::{EventLoop, EventHandler};
+//! use mio::{net::TcpListener, Interest, Token, event::Event};
 //! use std::net::SocketAddr;
 //!
 //! struct EchoHandler;
@@ -96,14 +96,13 @@
 
 use mio::{Interest, Token};
 pub mod error;
-pub mod event;
 pub mod handler;
 pub mod object_pool;
 pub mod poll;
 pub mod reactor;
 pub mod thread_pool;
-pub use event::Event;
 pub use handler::EventHandler;
+pub use mio::event::Event;
 pub use object_pool::{ObjectPool, PooledObject};
 
 use crate::{
@@ -147,8 +146,8 @@ pub mod prelude {
 /// Basic usage with default configuration:
 ///
 /// ```rust,no_run
-/// use mill_io::{EventLoop, EventHandler, event::Event};
-/// use mio::{net::TcpListener, Interest, Token};
+/// use mill_io::{EventLoop, EventHandler};
+/// use mio::{net::TcpListener, Interest, Token, event::Event};
 /// use std::net::SocketAddr;
 ///
 /// struct MyHandler;
@@ -259,8 +258,8 @@ impl EventLoop {
     /// ## Example
     ///
     /// ```rust,no_run
-    /// use mill_io::{EventLoop, EventHandler,event::Event};
-    /// use mio::{net::TcpListener, Interest, Token};
+    /// use mill_io::{EventLoop, EventHandler};
+    /// use mio::{net::TcpListener, Interest, Token, event::Event};
     /// use std::net::SocketAddr;
     ///
     /// struct ConnectionHandler;
@@ -318,8 +317,8 @@ impl EventLoop {
     /// ## Example
     ///
     /// ```rust,no_run
-    /// use mill_io::{EventLoop, EventHandler,event::Event};
-    /// use mio::{net::TcpListener, Interest, Token};
+    /// use mill_io::{EventLoop, EventHandler};
+    /// use mio::{net::TcpListener, Interest, Token, event::Event};
     /// use std::net::SocketAddr;
     ///
     /// struct Handler;

src/poll.rs

@@ -86,8 +86,7 @@ impl PollHandle {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::event::Event;
-    use mio::event::Source;
+    use mio::event::{Event, Source};
     use mio::Events;
     use std::sync::atomic::{AtomicBool, Ordering};
     use std::time::Duration;

src/reactor.rs

@@ -1,5 +1,5 @@
-use crate::{error::Result, event::Event, poll::PollHandle, thread_pool::ThreadPool};
-use mio::{event::Event as MioEvent, Events};
+use crate::{error::Result, poll::PollHandle, thread_pool::ThreadPool};
+use mio::{event::Event, Events};
 use std::{
     sync::{
         atomic::{AtomicBool, Ordering},
@@ -65,12 +65,11 @@ impl Reactor {
         }
     }
 
-    pub fn dispatch_event(&self, event: MioEvent) -> Result<()> {
+    pub fn dispatch_event(&self, event: Event) -> Result<()> {
         let token = event.token();
         let is_readable = event.is_readable();
         let is_writable = event.is_writable();
 
-        let unified_event: Event = Event::from(&event);
         let registry = self.poll_handle.get_registery();
 
         self.pool.exec(move || {
@@ -81,7 +80,7 @@ impl Reactor {
                 if (interest.is_readable() && is_readable)
                     || (interest.is_writable() && is_writable)
                 {
-                    handler.handle_event(&unified_event);
+                    handler.handle_event(&event);
                 }
             }
         })