switch to anyhow, don't use old style imports

Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>

diff --git a/Cargo.toml b/Cargo.toml
index d5b185ea1d20e46d59bdcee7e6ac5665c5c29d09..a4499b7eae92a327e4390779f3cfe8122fc39c99 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -10,8 +10,8 @@ homepage = "https://www.proxmox.com"
 exclude = [ "build", "debian" ]
 
 [dependencies]
+anyhow = "1"
 clap = "2.32"
-failure = "0.1.5"
 flate2 = "1.0"
 libc = "0.2.48"
 time = "0.1.42"

diff --git a/src/main.rs b/src/main.rs
index 419257b32f7c6cab06421093acde0fd10742cccd..daf0738f8a179d943ca47937067a9c3f13cccba4 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,9 +1,3 @@
-#[macro_use]
-extern crate clap;
-extern crate failure;
-extern crate flate2;
-extern crate libc;
-
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::ffi::CString;
@@ -15,15 +9,15 @@ use std::io::BufReader;
 use std::io::BufWriter;
 use std::io::Write;
 
-use failure::Error;
+use anyhow::{bail, Error};
 use flate2::read;
 
 use clap::{App, Arg};
 
 fn main() -> Result<(), Error> {
-    let matches = App::new(crate_name!())
-        .version(crate_version!())
-        .about(crate_description!())
+    let matches = App::new(clap::crate_name!())
+        .version(clap::crate_version!())
+        .about(clap::crate_description!())
         .arg(
             Arg::with_name("verbose")
                 .short("v")
@@ -1996,7 +1990,7 @@ impl Parser {
                 self.options.start = mkgmtime(&res);
                 self.start_tm = res;
             } else {
-                failure::bail!(failure::err_msg("failed to parse start time"));
+                bail!("failed to parse start time");
             }
         } else {
             let mut ltime = time::now();
@@ -2016,7 +2010,7 @@ impl Parser {
                 self.options.end = mkgmtime(&res);
                 self.end_tm = res;
             } else {
-                failure::bail!(failure::err_msg("failed to parse end time"));
+                bail!("failed to parse end time");
             }
         } else {
             let ltime = time::now();
@@ -2025,7 +2019,7 @@ impl Parser {
         }
 
         if self.options.end < self.options.start {
-            failure::bail!(failure::err_msg("end time before start time"));
+            bail!("end time before start time");
         }
 
         self.options.limit = match args.value_of("limit") {