matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Adapt to new all_contacts() return type

Browse source 
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>
This commit is contained in:
Matthias Beyer 2019-01-05 01:09:12 +01:00
parent 8fb4bcf0c6
commit 444ca2d424
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/domain/imag-contact/src/main.rs
View file

@ -73,7 +73,6 @@ use libimagerror::iter::TraceIterator;
use libimagcontact::store::ContactStore; use libimagcontact::store::ContactStore;
use libimagcontact::contact::Contact; use libimagcontact::contact::Contact;
use libimagcontact::deser::DeserVcard; use libimagcontact::deser::DeserVcard;
use libimagstore::iter::get::StoreIdGetIteratorExtension;
mod ui; mod ui;
mod util; mod util;
@ -120,7 +119,7 @@ fn list(rt: &Runtime) {
.store() .store()
.all_contacts() .all_contacts()
.map_err_trace_exit_unwrap() .map_err_trace_exit_unwrap()
.into_get_iter(rt.store()) .into_get_iter()
.trace_unwrap_exit() .trace_unwrap_exit()
.map(|fle| fle.ok_or_else(|| Error::from(err_msg("StoreId not found".to_owned())))) .map(|fle| fle.ok_or_else(|| Error::from(err_msg("StoreId not found".to_owned()))))
.trace_unwrap_exit() .trace_unwrap_exit()
@ -206,7 +205,7 @@ fn show(rt: &Runtime) {
rt.store() rt.store()
.all_contacts() .all_contacts()
.map_err_trace_exit_unwrap() .map_err_trace_exit_unwrap()
.into_get_iter(rt.store()) .into_get_iter()
.trace_unwrap_exit() .trace_unwrap_exit()
.map(|o| o.unwrap_or_else(|| { .map(|o| o.unwrap_or_else(|| {
error!("Failed to get entry"); error!("Failed to get entry");
@ -257,7 +256,7 @@ fn find(rt: &Runtime) {
.store() .store()
.all_contacts() .all_contacts()
.map_err_trace_exit_unwrap() .map_err_trace_exit_unwrap()
.into_get_iter(rt.store()) .into_get_iter()
.map(|el| { .map(|el| {
el.map_err_trace_exit_unwrap() el.map_err_trace_exit_unwrap()
.ok_or_else(|| { .ok_or_else(|| {

2
lib/domain/libimagwiki/src/wiki.rs
View file

@ -22,7 +22,7 @@ use std::path::PathBuf;
use libimagstore::store::Store; use libimagstore::store::Store;
use libimagstore::store::FileLockEntry; use libimagstore::store::FileLockEntry;
use libimagstore::storeid::IntoStoreId; use libimagstore::storeid::IntoStoreId;
use libimagstore::storeid::StoreIdIterator; use libimagstore::iter::Entries;
use libimagentrylink::internal::InternalLinker; use libimagentrylink::internal::InternalLinker;
use failure::Fallible as Result; use failure::Fallible as Result;