Move errno::Result back to crate root

src/errno.rs

@@ -1,6 +1,6 @@
 use libc::c_int;
-use std::{fmt, io, error, result};
-use Error;
+use std::{fmt, io, error};
+use {Error, Result};
 
 pub use self::consts::*;
 pub use self::consts::Errno::*;
@@ -117,8 +117,6 @@ impl From<Errno> for io::Error {
     }
 }
 
-pub type Result<T> = result::Result<T, Error>;
-
 fn last() -> Errno {
     Errno::from_i32(errno())
 }

src/fcntl.rs

@@ -1,5 +1,4 @@
-use NixPath;
-use errno::{Errno, Result};
+use {Errno, Result, NixPath};
 use libc::{c_int, c_uint};
 use sys::stat::Mode;
 use std::os::unix::io::RawFd;

src/lib.rs

@@ -20,7 +20,7 @@ extern crate nix_test as nixtest;
 
 // Re-exports
 pub use libc::{c_int, c_void};
-pub use errno::{Errno, Result};
+pub use errno::Errno;
 
 pub mod errno;
 pub mod features;
@@ -43,12 +43,12 @@ pub mod unistd;
 
 /*
  *
- * ===== Error =====
+ * ===== Result / Error =====
  *
  */
 
 use libc::c_char;
-use std::ptr;
+use std::{ptr, result};
 use std::ffi::CStr;
 use std::path::{Path, PathBuf};
 use std::os::unix::ffi::OsStrExt;
@@ -57,6 +57,8 @@ use std::fmt;
 use std::error;
 use libc::PATH_MAX;
 
+pub type Result<T> = result::Result<T, Error>;
+
 #[derive(Clone, Copy, Debug, PartialEq)]
 pub enum Error {
     Sys(errno::Errno),

src/mount.rs

@@ -1,6 +1,5 @@
 use libc::{c_ulong, c_int};
-use NixPath;
-use errno::{Errno, Result};
+use {Errno, Result, NixPath};
 
 bitflags!(
     flags MsFlags: c_ulong {

src/mqueue.rs

@@ -2,7 +2,7 @@
 //!
 //! [Further reading and details on the C API](http://man7.org/linux/man-pages/man7/mq_overview.7.html)
 
-use errno::{Errno, Result};
+use {Errno, Result};
 
 use libc::{c_int, c_long, c_char, size_t, mode_t, strlen};
 use std::ffi::CString;

src/poll.rs

@@ -1,5 +1,5 @@
 use libc::c_int;
-use errno::{Errno, Result};
+use {Errno, Result};
 
 pub use self::ffi::PollFd;
 pub use self::ffi::consts::*;

src/sched.rs

@@ -1,7 +1,7 @@
 use std::mem;
 use std::os::unix::io::RawFd;
 use libc::{c_int, c_uint, c_void, c_ulong, pid_t};
-use errno::{Errno, Result};
+use {Errno, Result};
 
 pub type CloneFlags = c_uint;
 

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;
 

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!(

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;

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",

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",

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;

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;
 

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;

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};

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;

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;

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 {

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 {

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;

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;

src/sys/wait.rs

@@ -1,5 +1,5 @@
 use libc::{pid_t, c_int};
-use errno::{Errno, Result};
+use {Errno, Result};
 
 use sys::signal;
 

src/unistd.rs

@@ -1,7 +1,6 @@
 //! Standard symbolic constants and types
 //!
-use {NixPath, Error};
-use errno::{Errno, Result};
+use {Errno, Error, Result, NixPath};
 use fcntl::{fcntl, OFlag, O_NONBLOCK, O_CLOEXEC, FD_CLOEXEC};
 use fcntl::FcntlArg::{F_SETFD, F_SETFL};
 use libc::{c_char, c_void, c_int, size_t, pid_t, off_t, uid_t, gid_t};
@@ -373,8 +372,7 @@ pub fn getegid() -> gid_t {
 #[cfg(any(target_os = "linux", target_os = "android"))]
 mod linux {
     use sys::syscall::{syscall, SYSPIVOTROOT};
-    use NixPath;
-    use errno::{Errno, Result};
+    use {Errno, Result, NixPath};
 
     #[cfg(feature = "execvpe")]
     use std::ffi::CString;