diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2017-12-05 03:37:27 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2017-12-05 03:37:27 +0000 |
commit | f778523d4d557ad2af720b33998b7b81c375c8e5 (patch) | |
tree | 4b816165a34360db36f0ea4e324517a7c89b6f2e /test | |
parent | 3871586a9bcff84eea6dd05f229fbe6ddb3f2bdd (diff) | |
parent | 512c35121e62062a802dadd787ee3dbda340a624 (diff) | |
download | nix-f778523d4d557ad2af720b33998b7b81c375c8e5.zip |
Merge #696
696: Stop reexporting `Errno` variants r=Susurrus a=jonas-schievink
Closes #664 (unsure if this is everything needed)
Diffstat (limited to 'test')
-rw-r--r-- | test/sys/test_epoll.rs | 3 | ||||
-rw-r--r-- | test/sys/test_ioctl.rs | 4 | ||||
-rw-r--r-- | test/sys/test_socket.rs | 3 |
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, |