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-mv/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-mv/src/lib.rs')
-rw-r--r-- | bin/core/imag-mv/src/lib.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/bin/core/imag-mv/src/lib.rs b/bin/core/imag-mv/src/lib.rs index 910eb831..3cc159b0 100644 --- a/bin/core/imag-mv/src/lib.rs +++ b/bin/core/imag-mv/src/lib.rs @@ -35,7 +35,7 @@ )] #[macro_use] extern crate log; -#[macro_use] extern crate failure; +#[macro_use] extern crate anyhow; extern crate resiter; extern crate clap; @@ -56,8 +56,8 @@ use libimagstore::store::FileLockEntry; use libimagentrylink::linkable::Linkable; use libimagstore::iter::get::StoreIdGetIteratorExtension; -use failure::Fallible as Result; -use failure::err_msg; +use anyhow::Result; + use resiter::IterInnerOkOrElse; use clap::App; @@ -86,19 +86,19 @@ impl ImagApplication for ImagMv { // remove links to entry, and re-add them later let mut linked_entries = rt.store() .get(sourcename.clone())? - .ok_or_else(|| format_err!("Entry does not exist: {}", sourcename))? + .ok_or_else(|| anyhow!("Entry does not exist: {}", sourcename))? .links()? .map(|link| link.get_store_id().clone()) .map(Ok) .into_get_iter(rt.store()) - .map_inner_ok_or_else(|| err_msg("Linked entry does not exist")) + .map_inner_ok_or_else(|| anyhow!("Linked entry does not exist")) .collect::<Result<Vec<_>>>()?; { // remove links to linked entries from source let mut entry = rt .store() .get(sourcename.clone())? - .ok_or_else(|| err_msg("Source Entry does not exist"))?; + .ok_or_else(|| anyhow!("Source Entry does not exist"))?; for link in linked_entries.iter_mut() { entry.remove_link(link)?; @@ -143,7 +143,7 @@ impl ImagApplication for ImagMv { fn relink<'a>(store: &'a Store, target: StoreId, linked_entries: &mut Vec<FileLockEntry<'a>>) -> Result<()> { let mut entry = store .get(target)? - .ok_or_else(|| err_msg("Funny things happened: Entry moved to destination did not fail, but entry does not exist"))?; + .ok_or_else(|| anyhow!("Funny things happened: Entry moved to destination did not fail, but entry does not exist"))?; linked_entries .iter_mut() |