Update some stuff for upstream bitflags changes

Author: emberian

Cargo.toml

@@ -20,7 +20,7 @@ execvpe = []
 
 [dependencies]
 libc     = "0.1.8"
-bitflags = "0.1.1"
+bitflags = "0.3.2"
 
 [dev-dependencies]
 rand = "0.3.8"

src/lib.rs

@@ -5,6 +5,9 @@
 #![crate_name = "nix"]
 #![cfg(unix)]
 #![allow(non_camel_case_types)]
+// latest bitflags triggers a rustc bug with cross-crate macro expansions causing dead_code
+// warnings even though the macro expands into something with allow(dead_code)
+#![allow(dead_code)]
 #![deny(warnings)]
 
 #[macro_use]

src/sys/epoll.rs

@@ -1,7 +1,6 @@
 use {Error, Result, from_ffi};
 use errno::Errno;
 use libc::c_int;
-use std::fmt;
 use std::os::unix::io::RawFd;
 
 mod ffi {
@@ -35,41 +34,6 @@ bitflags!(
     }
 );
 
-impl fmt::Debug for EpollEventKind {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        let variants = [
-            (EPOLLIN,       "EPOLLIN"),
-            (EPOLLPRI,      "EPOLLPRI"),
-            (EPOLLOUT,      "EPOLLOUT"),
-            (EPOLLRDNORM,   "EPOLLRDNORM"),
-            (EPOLLRDBAND,   "EPOLLRDBAND"),
-            (EPOLLWRNORM,   "EPOLLWRNORM"),
-            (EPOLLWRBAND,   "EPOLLWRBAND"),
-            (EPOLLMSG,      "EPOLLMSG"),
-            (EPOLLERR,      "EPOLLERR"),
-            (EPOLLHUP,      "EPOLLHUP"),
-            (EPOLLRDHUP,    "EPOLLRDHUP"),
-            (EPOLLWAKEUP,   "EPOLLWAKEUP"),
-            (EPOLLONESHOT,  "EPOLLONESHOT"),
-            (EPOLLET,       "EPOLLET")];
-
-        let mut first = true;
-
-        for &(val, name) in variants.iter() {
-            if self.contains(val) {
-                if first {
-                    first = false;
-                    try!(write!(fmt, "{}", name));
-                } else {
-                    try!(write!(fmt, "|{}", name));
-                }
-            }
-        }
-
-        Ok(())
-    }
-}
-
 #[derive(Clone, Copy)]
 #[repr(C)]
 pub enum EpollOp {

src/sys/ioctl.rs

@@ -4,7 +4,7 @@ pub use libc::stat as FileStat;
 use {Error, Result, NixPath, from_ffi};
 use errno::Errno;
 use libc::mode_t;
-use std::{fmt, mem};
+use std::mem;
 use std::os::unix::io::RawFd;
 
 mod ffi {
@@ -50,12 +50,6 @@ bitflags! {
     }
 }
 
-impl fmt::Debug for SFlag {
-    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {
-        write!(fmt, "SFlag {{ bits: {} }}", self.bits())
-    }
-}
-
 pub fn mknod<P: ?Sized + NixPath>(path: &P, kind: SFlag, perm: Mode, dev: dev_t) -> Result<()> {
     let res = try!(path.with_nix_path(|cstr| {
         unsafe {