Correctly gate shared code

Author: tautropfli

src/os/macos/poll.rs

@@ -1,4 +1,4 @@
-use super::super::PollReadTimedOutError;
+use crate::os::unix_common::timed_out;
 use libc::{c_int, pselect, time_t, timespec, FD_ISSET, FD_SET};
 use std::io;
 use std::mem::zeroed;
@@ -54,7 +54,3 @@ fn to_io_result(value: c_int) -> io::Result<c_int> {
         Ok(value)
     }
 }
-
-fn timed_out() -> io::Error {
-    io::Error::new(io::ErrorKind::TimedOut, PollReadTimedOutError)
-}

src/os/mod.rs

@@ -1,6 +1,3 @@
-use std::error::Error;
-use std::fmt;
-
 #[cfg(target_os = "macos")]
 mod macos;
 #[cfg(target_os = "macos")]
@@ -9,14 +6,5 @@ pub(crate) use macos::*;
 mod unix;
 #[cfg(all(unix, not(target_os = "macos")))]
 pub(crate) use unix::*;
-
-#[derive(Debug)]
-struct PollReadTimedOutError;
-
-impl fmt::Display for PollReadTimedOutError {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "poll_read timed out")
-    }
-}
-
-impl Error for PollReadTimedOutError {}
+#[cfg(unix)]
+mod unix_common;

src/os/unix/poll.rs

@@ -1,4 +1,4 @@
-use super::super::PollReadTimedOutError;
+use crate::os::unix_common::timed_out;
 use mio::unix::SourceFd;
 use mio::{Events, Interest, Poll, Token};
 use std::io;
@@ -26,7 +26,3 @@ pub(crate) fn poll_read(terminal: BorrowedFd, timeout: Duration) -> io::Result<(
     }
     Err(timed_out())
 }
-
-fn timed_out() -> io::Error {
-    io::Error::new(io::ErrorKind::TimedOut, PollReadTimedOutError)
-}

src/os/unix_common.rs

@@ -0,0 +1,17 @@
+use std::error::Error;
+use std::{fmt, io};
+
+pub(crate) fn timed_out() -> io::Error {
+    io::Error::new(io::ErrorKind::TimedOut, PollReadTimedOutError)
+}
+
+#[derive(Debug)]
+struct PollReadTimedOutError;
+
+impl fmt::Display for PollReadTimedOutError {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        write!(f, "poll_read timed out")
+    }
+}
+
+impl Error for PollReadTimedOutError {}