Merge branch 'replace-failure-with-anyhow'

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/domain/libimagcalendar/src/store.rs b/lib/domain/libimagcalendar/src/store.rs
index e18b8fe1..14d27921 100644
--- a/lib/domain/libimagcalendar/src/store.rs
+++ b/lib/domain/libimagcalendar/src/store.rs
@@ -19,10 +19,11 @@
 
 use std::path::Path;
 
-use failure::Fallible as Result;
+use anyhow::Result;
 use toml::Value;
 use toml_query::insert::TomlValueInsertExt;
 use vobject::ICalendar;
+use failure::Fail;
 
 use libimagentryutil::isa::Is;
 use libimagentryref::reference::Config;
@@ -75,7 +76,8 @@ impl<'a> EventStore<'a> for Store {
               Coll: AsRef<str>
     {
         let text = std::fs::read_to_string(p.as_ref())?;
-        Ok(ICalendar::build(&text)?
+        Ok(ICalendar::build(&text)
+            .map_err(|e| e.compat())?
             .events()
             .filter_map(|rresult| match rresult {
                 Ok(event)      => Some(event),
@@ -86,7 +88,7 @@ impl<'a> EventStore<'a> for Store {
             })
             .map(|event| {
                 let uid = event.uid().ok_or_else(|| {
-                    format_err!("Event in {} has no UID, but icalendar events must have one.", p.as_ref().display())
+                    anyhow!("Event in {} has no UID, but icalendar events must have one.", p.as_ref().display())
                 })?;
 
                 let sid        = crate::module_path::new_id(uid.raw())?;