update nix and remove old-style macro invocations

Author: acfoltzer

Cargo.toml

@@ -11,6 +11,6 @@ readme = "README.md"
 [dependencies]
 bitflags = "1.0"
 libc = "0.2.65"
-nix = "0.13"
+nix = "0.17"
 thiserror = "1.0.4"
 userfaultfd-sys = { path = "userfaultfd-sys", version = "0.1.1-dev" }

examples/manpage.rs

@@ -1,6 +1,6 @@
 //! Port of the example from the `userfaultfd` manpage.
 use libc::{self, c_void};
-use nix::poll::{poll, EventFlags, PollFd};
+use nix::poll::{poll, PollFd, PollFlags};
 use nix::sys::mman::{mmap, MapFlags, ProtFlags};
 use nix::unistd::{sysconf, SysconfVar};
 use std::env;
@@ -31,16 +31,16 @@ fn fault_handler_thread(uffd: Uffd) {
     loop {
         // See what poll() tells us about the userfaultfd
 
-        let pollfd = PollFd::new(uffd.as_raw_fd(), EventFlags::POLLIN);
+        let pollfd = PollFd::new(uffd.as_raw_fd(), PollFlags::POLLIN);
         let nready = poll(&mut [pollfd], -1).expect("poll");
 
         println!("\nfault_handler_thread():");
         let revents = pollfd.revents().unwrap();
         println!(
             "    poll() returns: nready = {}; POLLIN = {}; POLLERR = {}",
             nready,
-            revents.contains(EventFlags::POLLIN),
-            revents.contains(EventFlags::POLLERR),
+            revents.contains(PollFlags::POLLIN),
+            revents.contains(PollFlags::POLLERR),
         );
 
         // Read an event from the userfaultfd

linux-version/Cargo.toml

@@ -9,7 +9,7 @@ description = "Package for detecting the version of the linux kernel a program i
 build = "build.rs"
 
 [dependencies]
-nix = "0.13"
+nix = "0.17"
 semver = "0.9"
 
 [build-dependencies]

src/lib.rs

@@ -7,10 +7,6 @@
 //! [`ioctl_userfaultfd(2)`](http://man7.org/linux/man-pages/man2/ioctl_userfaultfd.2.html) for more
 //! details.
 
-// TODO: convert this to 2018-style import once `nix` exports its macros cleanly
-#[macro_use]
-extern crate nix;
-
 mod builder;
 mod error;
 mod event;

src/raw.rs

@@ -10,9 +10,9 @@ pub unsafe fn userfaultfd(flags: c_int) -> c_int {
     }
 }
 
-ioctl_readwrite!(api, UFFDIO, _UFFDIO_API, uffdio_api);
-ioctl_readwrite!(register, UFFDIO, _UFFDIO_REGISTER, uffdio_register);
-ioctl_read!(unregister, UFFDIO, _UFFDIO_UNREGISTER, uffdio_range);
-ioctl_read!(wake, UFFDIO, _UFFDIO_WAKE, uffdio_range);
-ioctl_readwrite!(copy, UFFDIO, _UFFDIO_COPY, uffdio_copy);
-ioctl_readwrite!(zeropage, UFFDIO, _UFFDIO_ZEROPAGE, uffdio_zeropage);
+nix::ioctl_readwrite!(api, UFFDIO, _UFFDIO_API, uffdio_api);
+nix::ioctl_readwrite!(register, UFFDIO, _UFFDIO_REGISTER, uffdio_register);
+nix::ioctl_read!(unregister, UFFDIO, _UFFDIO_UNREGISTER, uffdio_range);
+nix::ioctl_read!(wake, UFFDIO, _UFFDIO_WAKE, uffdio_range);
+nix::ioctl_readwrite!(copy, UFFDIO, _UFFDIO_COPY, uffdio_copy);
+nix::ioctl_readwrite!(zeropage, UFFDIO, _UFFDIO_ZEROPAGE, uffdio_zeropage);