Update dependencies and raise MSRV

Author: eldruin

.github/workflows/ci.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         # All published crates must build on stable.
-        rust: [stable, beta, 1.40.0]
+        rust: [stable, beta, 1.46.0]
 
         # The default target we're compiling on and for.
         TARGET: [x86_64-unknown-linux-gnu, x86_64-unknown-linux-musl]

CHANGELOG.md

@@ -2,8 +2,11 @@
 
 ## Not yet released
 
-- Nix bumped to 0.20
-- Minimum supported rust version is now 1.40.0
+[Full Changelog](https://github.com/rust-embedded/rust-spidev/compare/0.4.1...HEAD)
+
+- Nix bumped to 0.22
+- bitflags updated to 1.3
+- Minimum supported rust version is now 1.46.0
 
 ## 0.4.1 / 2021-02-21
 

Cargo.toml

@@ -17,5 +17,5 @@ half-duplex SPI access, and full-duplex SPI access.
 
 [dependencies]
 libc = "0.2"
-bitflags = "1.0"
-nix = "0.20"
+bitflags = "1.3"
+nix = "0.22"

README.md

@@ -76,7 +76,7 @@ The following features are implemented and planned for the library:
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.40 and up.  It *might*
+This crate is guaranteed to compile on stable Rust 1.46 and up.  It *might*
 compile with older versions but that may change in any new patch release.
 
 ## Cross Compiling

src/spidevioctl.rs

@@ -13,17 +13,10 @@ use std::io;
 use std::marker::PhantomData;
 use std::os::unix::prelude::*;
 
-fn from_nix_error(err: ::nix::Error) -> io::Error {
-    io::Error::from_raw_os_error(
-        err.as_errno()
-            .unwrap_or_else(|| nix::errno::Errno::UnknownErrno) as i32,
-    )
-}
-
 fn from_nix_result<T>(res: ::nix::Result<T>) -> io::Result<T> {
     match res {
         Ok(r) => Ok(r),
-        Err(err) => Err(from_nix_error(err)),
+        Err(err) => Err(err.into()),
     }
 }