x

src/event/event_api/source/unix/mio.rs

@@ -7,11 +7,11 @@ use crate::Result;
 
 #[cfg(feature = "event-stream")]
 use crate::event::sys::Waker;
+use crate::terminal::file_descriptor::{tty_fd, FileDesc};
 use crate::event::{
     source::EventSource,
     sys::unix::{
-        file_descriptor::{tty_fd, FileDesc},
-        parse::parse_event,
+                parse::parse_event,
     },
     timeout::PollTimeout,
     Event, InternalEvent,

src/event/event_api/types.rs

@@ -5,7 +5,7 @@ use std::{fmt};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
 
-use crate::{csi, Command, Result};
+use crate::{csi, Command};
 use bitflags::bitflags;
 use std::hash::{Hash, Hasher};
 
@@ -111,7 +111,7 @@ impl Command for PopKeyboardEnhancementFlags {
     }
 
     #[cfg(windows)]
-    fn execute_winapi(&self) -> Result<()> {
+    fn execute_winapi(&self) -> crate::Result<()> {
         use std::io;
 
         Err(io::Error::new(

src/terminal/sys.rs

@@ -20,6 +20,4 @@ mod windows;
 #[cfg(unix)]
 mod unix;
 #[cfg(unix)]
-pub mod file_descriptor;
-#[cfg(unix)]
-pub mod waker;
+pub mod file_descriptor;

src/terminal/sys/unix.rs

@@ -1,6 +1,6 @@
 //! UNIX related logic for terminal manipulation.
 
-use crate::event::sys::unix::file_descriptor::{tty_fd, FileDesc};
+use crate::terminal::sys::file_descriptor::{tty_fd, FileDesc};
 use libc::{
     cfmakeraw, ioctl, tcgetattr, tcsetattr, termios as Termios, winsize, STDOUT_FILENO, TCSANOW,
     TIOCGWINSZ,