summaryrefslogtreecommitdiffstats
path: root/lib/domain/libimagcontact/src/contact.rs
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2018-10-30 18:40:51 +0100
committerMatthias Beyer <mail@beyermatthias.de>2018-10-30 18:46:28 +0100
commit2a107477c0c5ce12177428ca5c94518550dc03fd (patch)
tree9f1698219c203a2cd5bfdcf4494ffa2b55f36683 /lib/domain/libimagcontact/src/contact.rs
parent2dc17f8bea23482dc1655cc9af3762c6e4fec8d2 (diff)
libimagcontact: Move from error-chain to failure
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'lib/domain/libimagcontact/src/contact.rs')
-rw-r--r--lib/domain/libimagcontact/src/contact.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/domain/libimagcontact/src/contact.rs b/lib/domain/libimagcontact/src/contact.rs
index fb586458..7d8eb644 100644
--- a/lib/domain/libimagcontact/src/contact.rs
+++ b/lib/domain/libimagcontact/src/contact.rs
@@ -20,15 +20,15 @@
use toml::to_string as toml_to_string;
use toml::from_str as toml_from_str;
use toml_query::read::TomlValueReadExt;
+use failure::Fallible as Result;
+use failure::Error;
use libimagstore::store::Entry;
use libimagentryutil::isa::Is;
use libimagentryutil::isa::IsKindHeaderPathProvider;
+use libimagerror::errors::ErrorMsg as EM;
use deser::DeserVcard;
-use error::Result;
-use error::ContactError as CE;
-use error::ContactErrorKind as CEK;
/// Trait to be implemented on ::libimagstore::store::Entry
pub trait Contact {
@@ -48,14 +48,14 @@ provide_kindflag_path!(pub IsContact, "contact.is_contact");
impl Contact for Entry {
fn is_contact(&self) -> Result<bool> {
- self.is::<IsContact>().map_err(From::from)
+ self.is::<IsContact>()
}
fn deser(&self) -> Result<DeserVcard> {
let data = self
.get_header()
.read("contact.data")?
- .ok_or_else(|| CE::from_kind(CEK::HeaderDataMissing("contact.data")))?;
+ .ok_or_else(|| Error::from(EM::EntryHeaderFieldMissing("contact.data")))?;
// ugly hack
let data_str = toml_to_string(&data)?;