Merge pull request #2 from fastly/tyler/refresher

Refresh library for open sourcing

Author: tyler

.github/workflows/rust.yml

@@ -17,3 +17,14 @@ jobs:
       run: cargo build --verbose
     - name: Run tests
       run: cargo test --verbose
+
+  audit:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install Cargo Audit
+      run: cargo install cargo-audit
+    - name: Audit
+      run: cargo audit

Cargo.lock

@@ -6,7 +6,7 @@ edition = "2018"
 
 [dependencies]
 bitflags = "1.0"
-failure = "0.1"
-libc = "=0.2.59"
+libc = "0.2.65"
 nix = "0.13"
+thiserror = "1.0.4"
 userfaultfd-sys = { path = "userfaultfd-sys" }

Cargo.toml

@@ -1,4 +1,4 @@
-![Rust](https://github.com/fastly/userfaultfd-rs/workflows/Rust/badge.svg)
+![Build](https://github.com/fastly/userfaultfd-rs/workflows/Rust/badge.svg)
 
 # userfaultfd-rs
 Rust bindings for Linux's userfaultfd functionality.

README.md

@@ -11,4 +11,4 @@ nix = "0.13"
 semver = "0.9"
 
 [build-dependencies]
-bindgen = "0.47"
+bindgen = "0.51"

linux-version/Cargo.toml

@@ -1,5 +1,5 @@
 use crate::IoctlFlags;
-use failure::Fail;
+use thiserror::Error;
 use nix::errno::Errno;
 
 pub type Result<T> = std::result::Result<T, Error>;
@@ -10,38 +10,38 @@ pub type Result<T> = std::result::Result<T, Error>;
 /// [`userfaultfd(2)`](http://man7.org/linux/man-pages/man2/userfaultfd.2.html) and
 /// [`ioctl_userfaultfd(2)`](http://man7.org/linux/man-pages/man2/ioctl_userfaultfd.2.html) for more
 /// details on how to interpret these errors.
-#[derive(Debug, Fail)]
+#[derive(Debug, Error)]
 pub enum Error {
     /// Copy ioctl failure with `errno` value.
-    #[fail(display = "copy failed: {}", 0)]
+    #[error("Copy failed")]
     CopyFailed(Errno),
 
     /// Failure to read a full `uffd_msg` struct from the underlying file descriptor.
-    #[fail(display = "incomplete uffd_msg; read only {}/{} bytes", read, expected)]
+    #[error("Incomplete uffd_msg; read only {read}/{expected} bytes")]
     IncompleteMsg { read: usize, expected: usize },
 
     /// Generic system error.
-    #[fail(display = "system error: {}", 0)]
-    SystemError(nix::Error),
+    #[error("System error")]
+    SystemError(#[source] nix::Error),
 
     /// End-of-file was read from the underlying file descriptor.
-    #[fail(display = "EOF when reading file descriptor")]
+    #[error("EOF when reading file descriptor")]
     ReadEof,
 
     /// An unrecognized event code was found in a `uffd_msg` struct.
-    #[fail(display = "unrecognized event in uffd_msg: {}", 0)]
+    #[error("Unrecognized event in uffd_msg: {0}")]
     UnrecognizedEvent(u8),
 
     /// An unrecognized ioctl bit was set in the result of API initialization or registration.
-    #[fail(display = "unrecognized ioctl flags: {}", 0)]
+    #[error("Unrecognized ioctl flags: {0}")]
     UnrecognizedIoctls(u64),
 
     /// Requested ioctls were not available when initializing the API.
-    #[fail(display = "requested ioctls unsupported; supported: {:?}", 0)]
+    #[error("Requested ioctls unsupported; supported: {0:?}")]
     UnsupportedIoctls(IoctlFlags),
 
     /// Zeropage ioctl failure with `errno` value.
-    #[fail(display = "zeropage failed: {}", 0)]
+    #[error("Zeropage failed: {0}")]
     ZeropageFailed(Errno),
 }
 

src/error.rs

@@ -10,6 +10,6 @@ build = "build.rs"
 cfg-if = "0.1"
 
 [build-dependencies]
-bindgen = "0.47"
+bindgen = "0.51"
 cc = "1.0"
 linux-version = { path = "../linux-version" }

userfaultfd-sys/Cargo.toml

@@ -62,7 +62,7 @@ impl ParseCallbacks for Callbacks {
             ("UFFD_PAGEFAULT_FLAG_", IntKind::U64),
             ("UFFD_FEATURE_", IntKind::U64),
         ]
-        .into_iter()
+        .iter()
         {
             if name.starts_with(prefix) {
                 return Some(*kind);