1 files changed, 18 insertions, 17 deletions

diff --git a/bin/domain/imag-calendar/src/lib.rs b/bin/domain/imag-calendar/src/lib.rs
index 5c549195..5e0bf058 100644
--- a/bin/domain/imag-calendar/src/lib.rs
+++ b/bin/domain/imag-calendar/src/lib.rs
@@ -34,7 +34,7 @@
     while_true,
 )]
 
-#[macro_use] extern crate failure;
+#[macro_use] extern crate anyhow;
 #[macro_use] extern crate log;
 extern crate clap;
 extern crate toml_query;
@@ -43,6 +43,7 @@ extern crate handlebars;
 extern crate chrono;
 extern crate kairos;
 extern crate resiter;
+extern crate failure;
 
 extern crate libimagrt;
 extern crate libimagcalendar;
@@ -53,9 +54,9 @@ extern crate libimagutil;
 use std::path::PathBuf;
 use std::io::Write;
 
-use failure::Error;
-use failure::err_msg;
-use failure::Fallible as Result;
+use anyhow::Error;
+
+use anyhow::Result;
 use toml_query::read::Partial;
 use toml_query::read::TomlValueReadExt;
 use walkdir::DirEntry;
@@ -82,7 +83,7 @@ mod util;
 pub enum ImagCalendar {}
 impl ImagApplication for ImagCalendar {
     fn run(rt: Runtime) -> Result<()> {
-        match rt.cli().subcommand_name().ok_or_else(|| err_msg("No subcommand called"))? {
+        match rt.cli().subcommand_name().ok_or_else(|| anyhow!("No subcommand called"))? {
             "import" => import(&rt),
             "list"   => list(&rt),
             "show"   => show(&rt),
@@ -92,7 +93,7 @@ impl ImagApplication for ImagCalendar {
                 if rt.handle_unknown_subcommand("imag-calendar", other, rt.cli())?.success() {
                     Ok(())
                 } else {
-                    Err(err_msg("Failed to handle unknown subcommand"))
+                    Err(anyhow!("Failed to handle unknown subcommand"))
                 }
             },
         }
@@ -121,14 +122,14 @@ fn import(rt: &Runtime) -> Result<()> {
     let do_fail         = scmd.is_present("import-fail");
     let force_override  = scmd.is_present("import-force-override");
     let ref_config      = rt.config()
-        .ok_or_else(|| format_err!("No configuration, cannot continue!"))?
+        .ok_or_else(|| anyhow!("No configuration, cannot continue!"))?
         .read_partial::<libimagentryref::reference::Config>()?
-        .ok_or_else(|| format_err!("Configuration missing: {}", libimagentryref::reference::Config::LOCATION))?;
+        .ok_or_else(|| anyhow!("Configuration missing: {}", libimagentryref::reference::Config::LOCATION))?;
 
     // sanity check
     debug!("Doing sanity check on config, to see whether the configuration required for importing is there");
     if ref_config.get(collection_name).is_none() {
-        return Err(format_err!("Configuration missing: {}.{}", libimagentryref::reference::Config::LOCATION, collection_name))
+        return Err(anyhow!("Configuration missing: {}.{}", libimagentryref::reference::Config::LOCATION, collection_name))
     }
 
     debug!("Starting import...");
@@ -191,9 +192,9 @@ fn list(rt: &Runtime) -> Result<()> {
     let do_filter_before = scmd.value_of("list-before");
     let do_filter_after  = scmd.value_of("list-after");
     let ref_config       = rt.config()
-        .ok_or_else(|| format_err!("No configuration, cannot continue!"))?
+        .ok_or_else(|| anyhow!("No configuration, cannot continue!"))?
         .read_partial::<libimagentryref::reference::Config>()?
-        .ok_or_else(|| format_err!("Configuration missing: {}", libimagentryref::reference::Config::LOCATION))?;
+        .ok_or_else(|| anyhow!("Configuration missing: {}", libimagentryref::reference::Config::LOCATION))?;
 
     debug!("List format: {:?}", list_format);
     debug!("Ref config : {:?}", ref_config);
@@ -234,13 +235,13 @@ fn list(rt: &Runtime) -> Result<()> {
     rt.store()
         .all_events()?
         .and_then_ok(|sid| rt.store().get(sid))
-        .map_inner_ok_or_else(|| err_msg("Missing entrty while calling all_events()"))
+        .map_inner_ok_or_else(|| anyhow!("Missing entrty while calling all_events()"))
         .and_then_ok(|ev| ParsedEventFLE::parse(ev, &ref_config))
         .and_then_ok(|parsed_entry| {
             parsed_entry
                 .get_data()
                 .events()
-                .map_err(|component| format_err!("Failed to parse entry: {}", component.name))
+                .map_err(|component| anyhow!("Failed to parse entry: {}", component.name))
                 .and_then_ok(|event| {
                     event_filter(&event).map(|b| (event, b))
                 })
@@ -264,9 +265,9 @@ fn list(rt: &Runtime) -> Result<()> {
 fn show(rt: &Runtime) -> Result<()> {
     let scmd        = rt.cli().subcommand_matches("show").unwrap(); // safe by clap
     let ref_config  = rt.config()
-        .ok_or_else(|| format_err!("No configuration, cannot continue!"))?
+        .ok_or_else(|| anyhow!("No configuration, cannot continue!"))?
         .read_partial::<libimagentryref::reference::Config>()?
-        .ok_or_else(|| format_err!("Configuration missing: {}", libimagentryref::reference::Config::LOCATION))?;
+        .ok_or_else(|| anyhow!("Configuration missing: {}", libimagentryref::reference::Config::LOCATION))?;
 
     let list_format = util::get_event_print_format("calendar.show_format", rt, &scmd)?;
 
@@ -280,14 +281,14 @@ fn show(rt: &Runtime) -> Result<()> {
             Ok((e, id))
         })
         .and_then_ok(|tpl| match tpl {
-            (None, id)    => Err(format_err!("Missing entry: {}", id)),
+            (None, id)    => Err(anyhow!("Missing entry: {}", id)),
             (Some(e), id) => Ok((e, id)),
         })
         .and_then_ok(|(parsed_entry, id)| {
             parsed_entry
                 .get_data()
                 .events()
-                .map_err(|component| format_err!("Failed to parse entry: {}", component.name))
+                .map_err(|component| anyhow!("Failed to parse entry: {}", component.name))
                 .filter_ok(|pent| {
                     let relevant = pent.uid().map(|uid| uid.raw().starts_with(id)).unwrap_or(false);
                     debug!("Relevant {} => {}", parsed_entry.get_entry().get_location(), relevant);