summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-04-30 19:24:05 +0200
committerMatthias Beyer <mail@beyermatthias.de>2018-05-01 17:44:01 +0200
commitdd453659ed9eabdcbcae0b5c8b4f49bc3e615fca (patch)
tree5d4fa6ece180bfe7a56371d7fdc1aa0343f27e65 /bin
parente6244d7e9eb77acd896bb7726f820d5c6da330a2 (diff)
Refactor imag-mv to fit new store iterator interface
Diffstat (limited to 'bin')
-rw-r--r--bin/core/imag-mv/src/main.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/bin/core/imag-mv/src/main.rs b/bin/core/imag-mv/src/main.rs
index fbb5021e..aeac022b 100644
--- a/bin/core/imag-mv/src/main.rs
+++ b/bin/core/imag-mv/src/main.rs
@@ -49,9 +49,11 @@ use std::path::PathBuf;
use libimagrt::setup::generate_runtime_setup;
use libimagerror::trace::MapErrTrace;
+use libimagerror::iter::TraceIterator;
use libimagstore::storeid::StoreId;
use libimagstore::store::Store;
use libimagstore::store::FileLockEntry;
+use libimagstore::error::StoreError;
use libimagentrylink::internal::InternalLinker;
use libimagstore::iter::get::StoreIdGetIteratorExtension;
@@ -91,11 +93,11 @@ fn main() {
})
.get_internal_links()
.map_err_trace_exit_unwrap(1)
- .map(|link| link.get_store_id().clone())
+ .map(|link| Ok(link.get_store_id().clone()) as Result<_, StoreError>)
.into_get_iter(rt.store())
+ .trace_unwrap_exit(1)
.map(|e| {
- e.map_err_trace_exit_unwrap(1)
- .unwrap_or_else(|| {
+ e.unwrap_or_else(|| {
error!("Linked entry does not exist");
exit(1)
})