4 files changed, 11 insertions, 7 deletions
diff --git a/lib/domain/libimagcalendar/Cargo.toml b/lib/domain/libimagcalendar/Cargo.toml
index b63ad0c3..809825f9 100644
--- a/lib/domain/libimagcalendar/Cargo.toml
+++ b/lib/domain/libimagcalendar/Cargo.toml
@@ -20,12 +20,13 @@ is-it-maintained-open-issues      = { repository = "matthiasbeyer/imag" }
 maintenance                       = { status     = "actively-developed" }
 
 [dependencies]
-failure     = "0.1"
+anyhow = "1"
 log         = "0.4"
 toml        = "0.5"
-toml-query  = "0.9"
+toml-query = { git = "https://github.com/matthiasbeyer/toml-query", branch = "master" }
 vobject     = "0.7"
 chrono      = "0.4"
+failure     = "0.1"
 
 libimagentrylink = { version = "0.10.0", path = "../../../lib/entry/libimagentrylink" }
 libimagentryref  = { version = "0.10.0", path = "../../../lib/entry/libimagentryref" }
diff --git a/lib/domain/libimagcalendar/src/event.rs b/lib/domain/libimagcalendar/src/event.rs
index e2aaaccb..550d2c1a 100644
--- a/lib/domain/libimagcalendar/src/event.rs
+++ b/lib/domain/libimagcalendar/src/event.rs
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-use failure::Fallible as Result;
+use anyhow::Result;
 
 use libimagentryutil::isa::Is;
 use libimagentryutil::isa::IsKindHeaderPathProvider;
diff --git a/lib/domain/libimagcalendar/src/lib.rs b/lib/domain/libimagcalendar/src/lib.rs
index fd3b8721..360ecc64 100644
--- a/lib/domain/libimagcalendar/src/lib.rs
+++ b/lib/domain/libimagcalendar/src/lib.rs
@@ -38,10 +38,11 @@
 #![recursion_limit="128"]
 
 #[macro_use] extern crate log;
-#[macro_use] extern crate failure;
+#[macro_use] extern crate anyhow;
 extern crate vobject;
 extern crate toml;
 extern crate toml_query;
+extern crate failure;
 
 #[macro_use] extern crate libimagstore;
 extern crate libimagerror;
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())?;