diff options
| author | Matthias Beyer <mail@beyermatthias.de> | 2019-01-05 01:09:12 +0100 |
|---|---|---|
| committer | Matthias Beyer <mail@beyermatthias.de> | 2019-02-15 20:53:29 +0100 |
| commit | 444ca2d424e280c2c3abd98f45f46b0d1fd7acb1 (patch) | |
| tree | e70cd5e87191768e3993e0943c753ed028910c22 | |
| parent | 8fb4bcf0c618972bb85da904399a0ddca1b05f6b (diff) | |
Adapt to new all_contacts() return type
because we return `libimagstore::iter::Entries` here now, we do not have
to pass the store anymore.
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
| -rw-r--r-- | bin/domain/imag-contact/src/main.rs | 7 | ||||
| -rw-r--r-- | lib/domain/libimagwiki/src/wiki.rs | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/bin/domain/imag-contact/src/main.rs b/bin/domain/imag-contact/src/main.rs index 9570e0ba..39c68ddf 100644 --- a/bin/domain/imag-contact/src/main.rs +++ b/bin/domain/imag-contact/src/main.rs @@ -73,7 +73,6 @@ use libimagerror::iter::TraceIterator; use libimagcontact::store::ContactStore; use libimagcontact::contact::Contact; use libimagcontact::deser::DeserVcard; -use libimagstore::iter::get::StoreIdGetIteratorExtension; mod ui; mod util; @@ -120,7 +119,7 @@ fn list(rt: &Runtime) { .store() .all_contacts() .map_err_trace_exit_unwrap() - .into_get_iter(rt.store()) + .into_get_iter() .trace_unwrap_exit() .map(|fle| fle.ok_or_else(|| Error::from(err_msg("StoreId not found".to_owned())))) .trace_unwrap_exit() @@ -206,7 +205,7 @@ fn show(rt: &Runtime) { rt.store() .all_contacts() .map_err_trace_exit_unwrap() - .into_get_iter(rt.store()) + .into_get_iter() .trace_unwrap_exit() .map(|o| o.unwrap_or_else(|| { error!("Failed to get entry"); @@ -257,7 +256,7 @@ fn find(rt: &Runtime) { .store() .all_contacts() .map_err_trace_exit_unwrap() - .into_get_iter(rt.store()) + .into_get_iter() .map(|el| { el.map_err_trace_exit_unwrap() .ok_or_else(|| { diff --git a/lib/domain/libimagwiki/src/wiki.rs b/lib/domain/libimagwiki/src/wiki.rs index 0855f4e7..743536bf 100644 --- a/lib/domain/libimagwiki/src/wiki.rs +++ b/lib/domain/libimagwiki/src/wiki.rs @@ -22,7 +22,7 @@ use std::path::PathBuf; use libimagstore::store::Store; use libimagstore::store::FileLockEntry; use libimagstore::storeid::IntoStoreId; -use libimagstore::storeid::StoreIdIterator; +use libimagstore::iter::Entries; use libimagentrylink::internal::InternalLinker; use failure::Fallible as Result; |