diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2018-10-30 18:40:51 +0100 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2018-10-30 18:46:28 +0100 |
commit | 2a107477c0c5ce12177428ca5c94518550dc03fd (patch) | |
tree | 9f1698219c203a2cd5bfdcf4494ffa2b55f36683 /lib/domain/libimagcontact/src/iter.rs | |
parent | 2dc17f8bea23482dc1655cc9af3762c6e4fec8d2 (diff) |
libimagcontact: Move from error-chain to failure
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib/domain/libimagcontact/src/iter.rs')
-rw-r--r-- | lib/domain/libimagcontact/src/iter.rs | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lib/domain/libimagcontact/src/iter.rs b/lib/domain/libimagcontact/src/iter.rs index 48f0f403..d175171b 100644 --- a/lib/domain/libimagcontact/src/iter.rs +++ b/lib/domain/libimagcontact/src/iter.rs @@ -20,11 +20,11 @@ use libimagstore::storeid::StoreIdIterator; use libimagstore::store::Store; use libimagstore::store::FileLockEntry; +use libimagerror::errors::ErrorMsg as EM; use contact::Contact; -use error::ContactError as CE; -use error::ContactErrorKind as CEK; -use error::Result; +use failure::Fallible as Result; +use failure::Error; pub struct ContactIter<'a>(StoreIdIterator, &'a Store); @@ -44,11 +44,12 @@ impl<'a> Iterator for ContactIter<'a> { loop { match self.0.next() { None => return None, - Some(Err(e)) => return Some(Err(e).map_err(CE::from)), + Some(Err(e)) => return Some(Err(e).map_err(Error::from)), Some(Ok(sid)) => match self.1.get(sid.clone()).map_err(From::from) { Err(e) => return Some(Err(e)), - Ok(None) => return Some(Err(CE::from_kind(CEK::EntryNotFound(sid)))), - Ok(Some(entry)) => match entry.is_contact().map_err(From::from) { + Ok(None) => return + Some(Err(Error::from(EM::EntryNotFound(sid.local_display_string())))), + Ok(Some(entry)) => match entry.is_contact().map_err(Error::from) { Ok(true) => return Some(Ok(entry)), Ok(false) => continue, Err(e) => return Some(Err(e)), |