Update nix to 0.10.0

The old version was getting a bit... old.  Update the dep version
and deal with the small amount of fallout due to various improvements
to nix upstream.

Signed-off-by: Paul Osborne <[email protected]>

Author: posborne

Cargo.toml

@@ -21,6 +21,6 @@ tokio = ["futures", "tokio-core", "mio-evented"]
 
 [dependencies]
 futures = { version = "0.1", optional = true }
-nix = "0.6.0"
+nix = "0.10.0"
 mio = { version = "0.6", optional = true }
 tokio-core = { version = "0.1", optional = true }

src/error.rs

@@ -1,6 +1,7 @@
 use std::convert;
 use std::fmt;
 use std::io;
+use nix;
 
 #[derive(Debug)]
 pub enum Error {
@@ -50,8 +51,11 @@ impl convert::From<io::Error> for Error {
     }
 }
 
-impl convert::From<::nix::Error> for Error {
-    fn from(e: ::nix::Error) -> Error {
-        Error::Io(io::Error::from_raw_os_error(e.errno() as i32))
+impl convert::From<nix::Error> for Error {
+    fn from(e: nix::Error) -> Error {
+        match e {
+            nix::Error::Sys(errno) => Error::Io(errno.into()),
+            other => Error::Unexpected(format!("{:?}", other)), // should just be dealing with errno case
+        }
     }
 }

src/lib.rs

@@ -515,13 +515,9 @@ impl PinPoller {
         let devfile: File = File::open(&format!("/sys/class/gpio/gpio{}/value", pin_num))?;
         let devfile_fd = devfile.as_raw_fd();
         let epoll_fd = epoll_create()?;
-        let events = EPOLLPRI | EPOLLET;
-        let info = EpollEvent {
-            events: events,
-            data: 0u64,
-        };
+        let mut event = EpollEvent::new(EpollFlags::EPOLLPRI | EpollFlags::EPOLLET, 0u64);
 
-        match epoll_ctl(epoll_fd, EpollOp::EpollCtlAdd, devfile_fd, &info) {
+        match epoll_ctl(epoll_fd, EpollOp::EpollCtlAdd, devfile_fd, &mut event) {
             Ok(_) => {
                 Ok(PinPoller {
                        pin_num: pin_num,
@@ -561,10 +557,7 @@ impl PinPoller {
     #[cfg(any(target_os = "linux", target_os = "android"))]
     pub fn poll(&mut self, timeout_ms: isize) -> Result<Option<u8>> {
         flush_input_from_file(&mut self.devfile, 255)?;
-        let dummy_event = EpollEvent {
-            events: EPOLLPRI | EPOLLET,
-            data: 0u64,
-        };
+        let dummy_event = EpollEvent::new(EpollFlags::EPOLLPRI | EpollFlags::EPOLLET, 0u64);
         let mut events: [EpollEvent; 1] = [dummy_event];
         let cnt = epoll_wait(self.epoll_fd, &mut events, timeout_ms)?;
         Ok(match cnt {