diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2020-03-07 16:04:33 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2020-03-08 11:43:24 +0100 |
commit | 8527d447ae2047e0d5d54cc70599a895b62a3ee0 (patch) | |
tree | 023de5d446d28c6a232308f8604e17a129ee49c7 /bin/core/imag-diagnostics/src/lib.rs | |
parent | 00aa4df88edae1d5eeb3fb365af05f95bd0de3b4 (diff) |
Replace failure with anyhow in complete codebase
This patch was scripted with
sed -i 's/use failure::Error/use anyhow::Error/' $(rg "use failure::Error" -l)
sed -i 's/use failure::Fallible as /use anyhow::/' $(rg "use failure::Fallible" -l)
sed -i 's/failure/anyhow/' $(rg "failure *=" -l)
sed -i 's/format_err!/anyhow!/' $(rg "format_err!" -l)
sed -i 's/use failure::ResultExt/use anyhow::Context/' $(rg "use failure::ResultExt" -l)
sed -i 's/err_msg/anyhow!/' $(rg "use failure::err_msg" -l)
sed -i 's/^anyhow\ *=.*$/anyhow = "1"/' $(rg "anyhow * =" -l)
sed -i 's/^anyhow_derive.*//' $(rg "anyhow_derive" -l)
sed -i 's/extern crate failure/extern crate anyhow/' $(rg "extern crate failure" -l)
sed -i 's/.*extern crate anyhow_derive.*//' $(rg "anyhow_derive" -l)
Some manual changes were added as well, so this patch was not completely
scripted, but mostly.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'bin/core/imag-diagnostics/src/lib.rs')
-rw-r--r-- | bin/core/imag-diagnostics/src/lib.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/core/imag-diagnostics/src/lib.rs b/bin/core/imag-diagnostics/src/lib.rs index 427abc67..ac7963f9 100644 --- a/bin/core/imag-diagnostics/src/lib.rs +++ b/bin/core/imag-diagnostics/src/lib.rs @@ -38,7 +38,7 @@ extern crate clap; extern crate toml; extern crate toml_query; extern crate indicatif; -extern crate failure; +#[macro_use] extern crate anyhow; extern crate resiter; #[macro_use] extern crate log; @@ -58,8 +58,8 @@ use libimagentrylink::linkable::Linkable; use toml::Value; use toml_query::read::TomlValueReadExt; use indicatif::{ProgressIterator, ProgressBar, ProgressStyle}; -use failure::Fallible as Result; -use failure::err_msg; +use anyhow::Result; + use clap::App; use resiter::AndThen; use resiter::IterInnerOkOrElse; @@ -132,7 +132,7 @@ impl ImagApplication for ImagDiagnostics { let diags = rt.store() .entries()? .into_get_iter() - .map_inner_ok_or_else(|| err_msg("Unable to get entry")) + .map_inner_ok_or_else(|| anyhow!("Unable to get entry")) .progress_with(progressbar) .and_then_ok(|e| { let diag = Diagnostic::for_entry(&e); @@ -254,11 +254,11 @@ impl ImagApplication for ImagDiagnostics { } fn get_config(rt: &Runtime, s: &'static str) -> Result<Option<String>> { - let cfg = rt.config().ok_or_else(|| err_msg("No configuration"))?; + let cfg = rt.config().ok_or_else(|| anyhow!("No configuration"))?; match cfg.read(s)? { Some(&Value::String(ref s)) => Ok(Some(s.to_owned())), - Some(_) => Err(err_msg("Config type wrong: 'rt.progressbar_style' should be a string")), + Some(_) => Err(anyhow!("Config type wrong: 'rt.progressbar_style' should be a string")), None => Ok(None), } } |