Skip to content

Commit d83c107

Browse files
committed
refactor: remove event::Event and use mio::event::Event directly
1 parent c2a4aba commit d83c107

File tree

5 files changed

+7
-54
lines changed

5 files changed

+7
-54
lines changed

src/event.rs

Lines changed: 0 additions & 43 deletions
This file was deleted.

src/handler.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
use crate::event::Event;
2-
use mio::Interest;
1+
use mio::{event::Event, Interest};
32

43
pub trait EventHandler {
54
fn handle_event(&self, event: &Event);

src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,13 @@
9696

9797
use mio::{Interest, Token};
9898
pub mod error;
99-
pub mod event;
10099
pub mod handler;
101100
pub mod object_pool;
102101
pub mod poll;
103102
pub mod reactor;
104103
pub mod thread_pool;
105-
pub use event::Event;
106104
pub use handler::EventHandler;
105+
pub use mio::event::Event;
107106
pub use object_pool::{ObjectPool, PooledObject};
108107

109108
use crate::{

src/poll.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,7 @@ impl PollHandle {
8686
#[cfg(test)]
8787
mod tests {
8888
use super::*;
89-
use crate::event::Event;
90-
use mio::event::Source;
89+
use mio::event::{Event, Source};
9190
use mio::Events;
9291
use std::sync::atomic::{AtomicBool, Ordering};
9392
use std::time::Duration;

src/reactor.rs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
use crate::{error::Result, event::Event, poll::PollHandle, thread_pool::ThreadPool};
2-
use mio::{event::Event as MioEvent, Events};
1+
use crate::{error::Result, poll::PollHandle, thread_pool::ThreadPool};
2+
use mio::{event::Event, Events};
33
use std::{
44
sync::{
55
atomic::{AtomicBool, Ordering},
@@ -65,12 +65,11 @@ impl Reactor {
6565
}
6666
}
6767

68-
pub fn dispatch_event(&self, event: MioEvent) -> Result<()> {
68+
pub fn dispatch_event(&self, event: Event) -> Result<()> {
6969
let token = event.token();
7070
let is_readable = event.is_readable();
7171
let is_writable = event.is_writable();
7272

73-
let unified_event: Event = Event::from(&event);
7473
let registry = self.poll_handle.get_registery();
7574

7675
self.pool.exec(move || {
@@ -81,7 +80,7 @@ impl Reactor {
8180
if (interest.is_readable() && is_readable)
8281
|| (interest.is_writable() && is_writable)
8382
{
84-
handler.handle_event(&unified_event);
83+
handler.handle_event(&event);
8584
}
8685
}
8786
})

0 commit comments

Comments
 (0)