Update nix and quicli dependencies

Author: eldruin

CHANGELOG.md

@@ -15,6 +15,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 - Update Tokio to 1.x. #[55]((https://github.com/rust-embedded/gpio-cdev/pull/55).
 - Breaking change of `LineEventHandle::get_event()` which now expects `&mut self`.
 - MSRV is now 1.45.0
+- Updated `nix` to version `0.20`.
+- Updated `quicli` to version `0.4`.
 
 
 ## v0.4.0 - 2020-08-01
@@ -27,17 +29,17 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 Refactored Errors:
 - Removed the `error-chain` dependency.
-- Errors are now implemented "manually" with `ErrorKind` and `IoctlKind` enums. 
+- Errors are now implemented "manually" with `ErrorKind` and `IoctlKind` enums.
 - The encompassing `Error` type implements the `std::error::Error` trait.
 
 ## v0.2.0 - 2018-12-12
 
 Adds the ability to create a collection of lines from a single chip and read or write those lines simultaneously with a single stystem call.
- 
+
 - A new `Lines` object (plural) was added. It is a collection of individual `Line` objects on a single `Chip` which can be read or written simultaneously with a single system call.
 - A `Line` now just contains the reference to the Chip and the offset number. No system call is incurred when one is created.
 - Information about an individual line is now represented by a separate `LineInfo` struct which can be obtained from the function `Line::info()`. This incurs a system call to retrieve the information.
-- Creating a `Line` can't fail unless the caller specifies an offset that is out of range of the chip. 
+- Creating a `Line` can't fail unless the caller specifies an offset that is out of range of the chip.
 - The `LineIterator` can not fail since it checks the offset range. So now its item is just a `Line`, and not `Result<Line>`.
 - There was no longer a need for `Line::refresh()` so it was removed.
 - Since a `Line` object is trivial to create, it is now OK to have `Lines` be a simple collection of `Line` structs.

Cargo.toml

@@ -22,12 +22,13 @@ required-features = ["async-tokio"]
 [dependencies]
 bitflags = "1.0"
 libc = "0.2"
-nix = "0.14"
+nix = "0.20"
 tokio = { version = "1", features = ["io-std", "net"], optional = true }
 futures = { version = "0.3", optional = true }
 
 [dev-dependencies]
-quicli = "0.2"
+quicli = "0.4"
+structopt = "0.3"
 anyhow = "1.0"
 tokio = { version = "1", features = ["io-std", "rt-multi-thread", "macros", "net"] }
 

examples/async_tokio.rs

@@ -8,7 +8,7 @@
 
 use futures::stream::StreamExt;
 use gpio_cdev::{AsyncLineEventHandle, Chip, EventRequestFlags, LineRequestFlags};
-use quicli::prelude::*;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Cli {

examples/blinky.rs

@@ -10,6 +10,7 @@ use gpio_cdev::{Chip, LineRequestFlags};
 use quicli::prelude::*;
 use std::thread::sleep;
 use std::time::{Duration, Instant};
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Cli {
@@ -44,9 +45,10 @@ fn do_main(args: Cli) -> std::result::Result<(), gpio_cdev::Error> {
     Ok(())
 }
 
-quicli::main!(|args: Cli| match do_main(args) {
-    Ok(()) => {}
-    Err(e) => {
-        println!("Error: {:?}", e);
-    }
-});
+fn main() -> CliResult {
+    let args = Cli::from_args();
+    do_main(args).or_else(|e| {
+        error!("{:?}", e);
+        Ok(())
+    })
+}

examples/driveoutput.rs

@@ -8,6 +8,7 @@
 
 use gpio_cdev::{Chip, LineRequestFlags};
 use quicli::prelude::*;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Cli {
@@ -40,9 +41,10 @@ fn do_main(args: Cli) -> std::result::Result<(), gpio_cdev::Error> {
     Ok(())
 }
 
-quicli::main!(|args: Cli| match do_main(args) {
-    Ok(()) => {}
-    Err(e) => {
-        println!("Error: {:?}", e);
-    }
-});
+fn main() -> CliResult {
+    let args = Cli::from_args();
+    do_main(args).or_else(|e| {
+        error!("{:?}", e);
+        Ok(())
+    })
+}

examples/gpioevents.rs

@@ -8,6 +8,7 @@
 
 use gpio_cdev::{Chip, EventRequestFlags, LineRequestFlags};
 use quicli::prelude::*;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Cli {
@@ -32,9 +33,10 @@ fn do_main(args: Cli) -> std::result::Result<(), gpio_cdev::Error> {
     Ok(())
 }
 
-quicli::main!(|args: Cli| match do_main(args) {
-    Ok(()) => {}
-    Err(e) => {
-        println!("Error: {:?}", e);
-    }
-});
+fn main() -> CliResult {
+    let args = Cli::from_args();
+    do_main(args).or_else(|e| {
+        error!("{:?}", e);
+        Ok(())
+    })
+}

examples/lsgpio.rs

@@ -8,8 +8,6 @@
 
 //! Clone of functionality of linux/tools/gpio/lsgpio.c
 
-extern crate gpio_cdev;
-
 use gpio_cdev::*;
 
 fn main() {

examples/monitor.rs

@@ -6,16 +6,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern crate gpio_cdev;
-extern crate nix;
-#[macro_use]
-extern crate quicli;
-extern crate anyhow;
-
 use gpio_cdev::*;
 use nix::poll::*;
 use quicli::prelude::*;
 use std::os::unix::io::AsRawFd;
+use structopt::StructOpt;
 
 type PollEventFlags = nix::poll::PollFlags;
 
@@ -82,11 +77,10 @@ fn do_main(args: Cli) -> anyhow::Result<()> {
     }
 }
 
-main!(|args: Cli| {
-    match do_main(args) {
-        Ok(()) => {}
-        Err(e) => {
-            println!("Error: {:?}", e);
-        }
-    }
-});
+fn main() -> CliResult {
+    let args = Cli::from_args();
+    do_main(args).or_else(|e| {
+        error!("{:?}", e);
+        Ok(())
+    })
+}

examples/multioutput.rs

@@ -8,6 +8,7 @@
 
 use gpio_cdev::{Chip, LineRequestFlags};
 use quicli::prelude::*;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Cli {
@@ -48,9 +49,10 @@ fn do_main(args: Cli) -> std::result::Result<(), gpio_cdev::Error> {
     Ok(())
 }
 
-quicli::main!(|args: Cli| match do_main(args) {
-    Ok(()) => {}
-    Err(e) => {
-        println!("Error: {:?}", e);
-    }
-});
+fn main() -> CliResult {
+    let args = Cli::from_args();
+    do_main(args).or_else(|e| {
+        error!("{:?}", e);
+        Ok(())
+    })
+}

examples/multiread.rs

@@ -8,6 +8,7 @@
 
 use gpio_cdev::{Chip, LineRequestFlags};
 use quicli::prelude::*;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Cli {
@@ -28,9 +29,10 @@ fn do_main(args: Cli) -> std::result::Result<(), gpio_cdev::Error> {
     Ok(())
 }
 
-quicli::main!(|args: Cli| match do_main(args) {
-    Ok(()) => {}
-    Err(e) => {
-        println!("Error: {:?}", e);
-    }
-});
+fn main() -> CliResult {
+    let args = Cli::from_args();
+    do_main(args).or_else(|e| {
+        error!("{:?}", e);
+        Ok(())
+    })
+}

examples/readall.rs

@@ -8,6 +8,7 @@
 
 use gpio_cdev::{Chip, LineRequestFlags};
 use quicli::prelude::*;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Cli {
@@ -26,9 +27,10 @@ fn do_main(args: Cli) -> std::result::Result<(), gpio_cdev::Error> {
     Ok(())
 }
 
-quicli::main!(|args: Cli| match do_main(args) {
-    Ok(()) => {}
-    Err(e) => {
-        println!("Error: {:?}", e);
-    }
-});
+fn main() -> CliResult {
+    let args = Cli::from_args();
+    do_main(args).or_else(|e| {
+        error!("{:?}", e);
+        Ok(())
+    })
+}

examples/readinput.rs

@@ -8,6 +8,7 @@
 
 use gpio_cdev::{Chip, LineRequestFlags};
 use quicli::prelude::*;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Cli {
@@ -27,9 +28,10 @@ fn do_main(args: Cli) -> std::result::Result<(), gpio_cdev::Error> {
     Ok(())
 }
 
-quicli::main!(|args: Cli| match do_main(args) {
-    Ok(()) => {}
-    Err(e) => {
-        println!("Error: {:?}", e);
-    }
-});
+fn main() -> CliResult {
+    let args = Cli::from_args();
+    do_main(args).or_else(|e| {
+        error!("{:?}", e);
+        Ok(())
+    })
+}

examples/tit_for_tat.rs

@@ -10,6 +10,7 @@ use gpio_cdev::{Chip, EventRequestFlags, EventType, LineRequestFlags};
 use quicli::prelude::*;
 use std::thread::sleep;
 use std::time::Duration;
+use structopt::StructOpt;
 
 #[derive(Debug, StructOpt)]
 struct Cli {
@@ -54,9 +55,10 @@ fn do_main(args: Cli) -> std::result::Result<(), gpio_cdev::Error> {
     Ok(())
 }
 
-quicli::main!(|args: Cli| match do_main(args) {
-    Ok(()) => {}
-    Err(e) => {
-        println!("Error: {:?}", e);
-    }
-});
+fn main() -> CliResult {
+    let args = Cli::from_args();
+    do_main(args).or_else(|e| {
+        error!("{:?}", e);
+        Ok(())
+    })
+}