Stop reexporting `Errno` and its variants

cc #664 (unsure if this is everything needed)

3 files changed, 6 insertions, 4 deletions

diff --git a/test/sys/test_epoll.rs b/test/sys/test_epoll.rs
index e32a4e23..e0dc5131 100644
--- a/test/sys/test_epoll.rs
+++ b/test/sys/test_epoll.rs
@@ -1,6 +1,7 @@
 use nix::sys::epoll::{EpollCreateFlags, EpollFlags, EpollOp, EpollEvent};
 use nix::sys::epoll::{epoll_create1, epoll_ctl};
-use nix::{Error, Errno};
+use nix::Error;
+use nix::errno::Errno;
 
 #[test]
 pub fn test_epoll_errno() {
diff --git a/test/sys/test_ioctl.rs b/test/sys/test_ioctl.rs
index 1b9e464b..1ed4a4b4 100644
--- a/test/sys/test_ioctl.rs
+++ b/test/sys/test_ioctl.rs
@@ -210,7 +210,7 @@ mod linux_ioctls {
     use libc::{TCGETS, TCSBRK, TCSETS, TIOCNXCL, termios};
 
     use nix::Error::Sys;
-    use nix::errno::{ENOTTY, ENOSYS};
+    use nix::errno::Errno::{ENOTTY, ENOSYS};
 
     ioctl!(bad none tiocnxcl with TIOCNXCL);
     #[test]
@@ -345,7 +345,7 @@ mod freebsd_ioctls {
     use libc::termios;
 
     use nix::Error::Sys;
-    use nix::errno::ENOTTY;
+    use nix::errno::Errno::ENOTTY;
 
     // From sys/sys/ttycom.h
     const TTY_IOC_MAGIC: u8 = b't';
diff --git a/test/sys/test_socket.rs b/test/sys/test_socket.rs
index 8ec7f1fd..d29b2ecb 100644
--- a/test/sys/test_socket.rs
+++ b/test/sys/test_socket.rs
@@ -242,7 +242,8 @@ pub fn test_unixdomain() {
 #[cfg(any(target_os = "macos", target_os = "ios"))]
 #[test]
 pub fn test_syscontrol() {
-    use nix::{Errno, Error};
+    use nix::Error;
+    use nix::errno::Errno;
     use nix::sys::socket::{AddressFamily, socket, SockAddr, SockType, SockFlag, SockProtocol};
 
     let fd = socket(AddressFamily::System, SockType::Datagram,