diff options
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() |