From 9a4b7e674e1316a4506cb06e13135e10c875c6a4 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Tue, 6 Apr 2021 11:14:48 +0200 Subject: Replace failure with anyhow Signed-off-by: Matthias Beyer --- Cargo.toml | 2 +- src/backend.rs | 2 +- src/frontend/json.rs | 4 ++-- src/frontend/list.rs | 4 ++-- src/frontend/mod.rs | 2 +- src/frontend/table.rs | 2 +- src/main.rs | 13 ++++++------- 7 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index b7cacfc..a5ea631 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" } [dependencies] librepology = { version = "0.1.0", path = "./librepology" } -failure = "0.1" +anyhow = "1" serde = "1" serde_derive = "1" serde_json = "1" diff --git a/src/backend.rs b/src/backend.rs index c29b05e..efc6f37 100644 --- a/src/backend.rs +++ b/src/backend.rs @@ -1,7 +1,7 @@ use clap::ArgMatches; -use failure::Fallible as Result; use librepology::v1::api::Api; +use librepology::v1::error::Result; use librepology::v1::restapi::RestApi; use librepology::v1::stdinapi::StdinWrapper; use librepology::v1::types::*; diff --git a/src/frontend/json.rs b/src/frontend/json.rs index 39e86f8..6ef5e0c 100644 --- a/src/frontend/json.rs +++ b/src/frontend/json.rs @@ -2,11 +2,11 @@ use std::io::Stdout; use std::io::Write; use std::ops::Deref; +use anyhow::Error; +use anyhow::Result; use librepology::v1::types::Package; use librepology::v1::types::Problem; use librepology::v1::types::Repo; -use failure::Fallible as Result; -use failure::Error; use crate::frontend::Frontend; use crate::backend::Backend; diff --git a/src/frontend/list.rs b/src/frontend/list.rs index 950cfe2..61aa670 100644 --- a/src/frontend/list.rs +++ b/src/frontend/list.rs @@ -2,12 +2,12 @@ use std::io::Stdout; use std::io::Write; use std::ops::Deref; +use anyhow::Error; +use anyhow::Result; use librepology::v1::types::Name; use librepology::v1::types::Package; use librepology::v1::types::Problem; use librepology::v1::types::Repo; -use failure::Fallible as Result; -use failure::Error; use crate::frontend::Frontend; use crate::backend::Backend; diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs index bcce43a..e2dda0e 100644 --- a/src/frontend/mod.rs +++ b/src/frontend/mod.rs @@ -1,5 +1,5 @@ +use anyhow::Result; use clap::ArgMatches; -use failure::Fallible as Result; use librepology::v1::types::*; diff --git a/src/frontend/table.rs b/src/frontend/table.rs index e7b4840..12452a8 100644 --- a/src/frontend/table.rs +++ b/src/frontend/table.rs @@ -1,11 +1,11 @@ use std::io::Stdout; use std::ops::Deref; +use anyhow::Result; use librepology::v1::types::Name; use librepology::v1::types::Package; use librepology::v1::types::Problem; use librepology::v1::types::Repo; -use failure::Fallible as Result; use prettytable::format; use prettytable::Table; diff --git a/src/main.rs b/src/main.rs index 8b7e67b..c963f63 100644 --- a/src/main.rs +++ b/src/main.rs @@ -14,7 +14,7 @@ extern crate csv; #[macro_use] extern crate serde_derive; #[macro_use] extern crate log; -#[macro_use] extern crate failure; +#[macro_use] extern crate anyhow; #[macro_use] extern crate prettytable; mod config; @@ -29,10 +29,9 @@ use std::cmp::Ordering; #[cfg(feature = "compare_csv")] use std::io::Cursor; -use failure::err_msg; -use failure::Error; -use failure::ResultExt; -use failure::Fallible as Result; +use anyhow::Error; +use anyhow::Context; +use anyhow::Result; use clap::ArgMatches; use filters::filter::Filter; use boolinator::Boolinator; @@ -118,7 +117,7 @@ fn app() -> Result<()> { debug!("Searching for configuration in XDG"); xdg::BaseDirectories::new()? .find_config_file("repolocli.toml") - .ok_or_else(|| err_msg("Cannot find repolocli.toml")) + .ok_or_else(|| anyhow!("Cannot find repolocli.toml")) }?; debug!("Parsing configuration from file: {}", path.display()); @@ -301,7 +300,7 @@ fn app() -> Result<()> { fn print_error(e: Error) { error!("Error: {}", e); - e.iter_causes().for_each(|cause| { + e.chain().for_each(|cause| { error!("Caused by: {}", cause) }); } -- cgit v1.2.3