19 files changed, 19 insertions, 27 deletions
diff --git a/src/sys/epoll.rs b/src/sys/epoll.rs
index a079649a..592f10a1 100644
--- a/src/sys/epoll.rs
+++ b/src/sys/epoll.rs
@@ -1,4 +1,4 @@
-use errno::{Errno, Result};
+use {Errno, Result};
 use libc::c_int;
 use std::os::unix::io::RawFd;
 
diff --git a/src/sys/event.rs b/src/sys/event.rs
index eb99f7d9..8b112689 100644
--- a/src/sys/event.rs
+++ b/src/sys/event.rs
@@ -1,7 +1,7 @@
 /* TOOD: Implement for other kqueue based systems
  */
 
-use errno::{Errno, Result};
+use {Errno, Result};
 #[cfg(not(target_os = "netbsd"))]
 use libc::{timespec, time_t, c_int, c_long, uintptr_t};
 #[cfg(target_os = "netbsd")]
diff --git a/src/sys/eventfd.rs b/src/sys/eventfd.rs
index d2cd6b93..cd740341 100644
--- a/src/sys/eventfd.rs
+++ b/src/sys/eventfd.rs
@@ -1,6 +1,6 @@
 use libc;
 use std::os::unix::io::RawFd;
-use errno::{Errno, Result};
+use {Errno, Result};
 
 bitflags!(
     flags EventFdFlag: libc::c_int {
diff --git a/src/sys/memfd.rs b/src/sys/memfd.rs
index c5b7b803..1cd94150 100644
--- a/src/sys/memfd.rs
+++ b/src/sys/memfd.rs
@@ -1,6 +1,6 @@
 use libc;
 use std::os::unix::io::RawFd;
-use errno::{Errno, Result};
+use {Errno, Result};
 use std::ffi::CStr;
 
 bitflags!(
diff --git a/src/sys/mman.rs b/src/sys/mman.rs
index cb36cf7b..7537c272 100644
--- a/src/sys/mman.rs
+++ b/src/sys/mman.rs
@@ -1,5 +1,4 @@
-use {NixPath, Error};
-use errno::{Errno, Result};
+use {Errno, Error, Result, NixPath};
 use fcntl::OFlag;
 use libc::{c_void, size_t, off_t, mode_t};
 use sys::stat::Mode;
diff --git a/src/sys/ptrace.rs b/src/sys/ptrace.rs
index 9d8e6932..63c7482d 100644
--- a/src/sys/ptrace.rs
+++ b/src/sys/ptrace.rs
@@ -1,5 +1,4 @@
-use Error;
-use errno::{Errno, Result};
+use {Errno, Error, Result};
 use libc::{pid_t, c_void, c_long};
 
 #[cfg(all(target_os = "linux",
diff --git a/src/sys/quota.rs b/src/sys/quota.rs
index 7a7718e4..a6a1b9b0 100644
--- a/src/sys/quota.rs
+++ b/src/sys/quota.rs
@@ -1,5 +1,4 @@
-use NixPath;
-use errno::{Errno, Result};
+use {Errno, Result, NixPath};
 use libc::{c_int, c_char};
 
 #[cfg(all(target_os = "linux",
diff --git a/src/sys/select.rs b/src/sys/select.rs
index db0a55b9..9d7c41f8 100644
--- a/src/sys/select.rs
+++ b/src/sys/select.rs
@@ -1,7 +1,7 @@
 use std::ptr::null_mut;
 use std::os::unix::io::RawFd;
 use libc::c_int;
-use errno::{Errno, Result};
+use {Errno, Result};
 use sys::time::TimeVal;
 
 pub const FD_SETSIZE: RawFd = 1024;
diff --git a/src/sys/signal.rs b/src/sys/signal.rs
index 76984f2c..3d267294 100644
--- a/src/sys/signal.rs
+++ b/src/sys/signal.rs
@@ -2,7 +2,7 @@
 // See http://rust-lang.org/COPYRIGHT.
 
 use libc;
-use errno::{Errno, Result};
+use {Errno, Result};
 use std::mem;
 use std::ptr;
 
diff --git a/src/sys/signalfd.rs b/src/sys/signalfd.rs
index 7d1455e6..01ea66b9 100644
--- a/src/sys/signalfd.rs
+++ b/src/sys/signalfd.rs
@@ -17,7 +17,7 @@
 //! signal handlers.
 use libc::{c_int, pid_t, uid_t};
 use unistd;
-use errno::{Errno, Result};
+use {Errno, Result};
 use sys::signal::signal::siginfo as signal_siginfo;
 pub use sys::signal::{self, SigSet};
 
diff --git a/src/sys/socket/addr.rs b/src/sys/socket/addr.rs
index 49a1ecf5..343e54f9 100644
--- a/src/sys/socket/addr.rs
+++ b/src/sys/socket/addr.rs
@@ -1,6 +1,5 @@
 use super::{consts, sa_family_t};
-use {NixPath, Error};
-use errno::{Errno, Result};
+use {Errno, Error, Result, NixPath};
 use libc;
 use std::{fmt, hash, mem, net, ptr};
 use std::ffi::OsStr;
diff --git a/src/sys/socket/mod.rs b/src/sys/socket/mod.rs
index 60b138ed..fe88b376 100644
--- a/src/sys/socket/mod.rs
+++ b/src/sys/socket/mod.rs
@@ -1,8 +1,7 @@
 //! Socket interface functions
 //!
 //! [Further reading](http://man7.org/linux/man-pages/man7/socket.7.html)
-use Error;
-use errno::{Errno, Result};
+use {Error, Errno, Result};
 use features;
 use fcntl::{fcntl, FD_CLOEXEC, O_NONBLOCK};
 use fcntl::FcntlArg::{F_SETFD, F_SETFL};
diff --git a/src/sys/socket/sockopt.rs b/src/sys/socket/sockopt.rs
index a9d6e67c..f0845033 100644
--- a/src/sys/socket/sockopt.rs
+++ b/src/sys/socket/sockopt.rs
@@ -1,5 +1,5 @@
 use super::{ffi, consts, GetSockOpt, SetSockOpt};
-use errno::{Errno, Result};
+use {Errno, Result};
 use sys::time::TimeVal;
 use libc::{c_int, uint8_t, c_void, socklen_t};
 use std::mem;
diff --git a/src/sys/stat.rs b/src/sys/stat.rs
index 391924da..cd142a96 100644
--- a/src/sys/stat.rs
+++ b/src/sys/stat.rs
@@ -1,8 +1,7 @@
 pub use libc::dev_t;
 pub use libc::stat as FileStat;
 
-use NixPath;
-use errno::{Errno, Result};
+use {Errno, Result, NixPath};
 use libc::mode_t;
 use std::mem;
 use std::os::unix::io::RawFd;
diff --git a/src/sys/statfs.rs b/src/sys/statfs.rs
index 0552e3d0..7c61a3ab 100644
--- a/src/sys/statfs.rs
+++ b/src/sys/statfs.rs
@@ -1,5 +1,4 @@
-use NixPath;
-use errno::{Errno, Result};
+use {Errno, Result, NixPath};
 use std::os::unix::io::AsRawFd;
 
 pub mod vfs {
diff --git a/src/sys/statvfs.rs b/src/sys/statvfs.rs
index abfc6c9b..5b72a16b 100644
--- a/src/sys/statvfs.rs
+++ b/src/sys/statvfs.rs
@@ -2,8 +2,7 @@
 //!
 //! See the `vfs::Statvfs` struct for some rusty wrappers
 
-use NixPath;
-use errno::{Errno, Result};
+use {Errno, Result, NixPath};
 use std::os::unix::io::AsRawFd;
 
 pub mod vfs {
diff --git a/src/sys/termios.rs b/src/sys/termios.rs
index 9c26661f..78e98028 100644
--- a/src/sys/termios.rs
+++ b/src/sys/termios.rs
@@ -1,4 +1,4 @@
-use errno::{Errno, Result};
+use {Errno, Result};
 use libc::c_int;
 use std::mem;
 use std::os::unix::io::RawFd;
diff --git a/src/sys/uio.rs b/src/sys/uio.rs
index 7e734f84..03f2a3a8 100644
--- a/src/sys/uio.rs
+++ b/src/sys/uio.rs
@@ -1,7 +1,7 @@
 // Silence invalid warnings due to rust-lang/rust#16719
 #![allow(improper_ctypes)]
 
-use errno::{Errno, Result};
+use {Errno, Result};
 use libc::{c_int, c_void, size_t, off_t};
 use std::marker::PhantomData;
 use std::os::unix::io::RawFd;
diff --git a/src/sys/wait.rs b/src/sys/wait.rs
index ab91a848..3d9b3a50 100644
--- a/src/sys/wait.rs
+++ b/src/sys/wait.rs
@@ -1,5 +1,5 @@
 use libc::{pid_t, c_int};
-use errno::{Errno, Result};
+use {Errno, Result};
 
 use sys::signal;