1 files changed, 15 insertions, 15 deletions

diff --git a/bin/domain/imag-wiki/src/lib.rs b/bin/domain/imag-wiki/src/lib.rs
index cc05194f..331843ec 100644
--- a/bin/domain/imag-wiki/src/lib.rs
+++ b/bin/domain/imag-wiki/src/lib.rs
@@ -23,7 +23,7 @@ extern crate clap;
 extern crate regex;
 extern crate filters;
 #[macro_use] extern crate log;
-#[macro_use] extern crate failure;
+#[macro_use] extern crate anyhow;
 extern crate resiter;
 
 extern crate libimagrt;
@@ -35,10 +35,10 @@ extern crate libimagentrylink;
 extern crate libimagutil;
 
 use std::io::Write;
-use failure::Fallible as Result;
-use failure::ResultExt;
-use failure::Error;
-use failure::err_msg;
+use anyhow::Result;
+use anyhow::Context;
+use anyhow::Error;
+
 use clap::App;
 use resiter::AndThen;
 
@@ -61,7 +61,7 @@ impl ImagApplication for ImagWiki {
         trace!("wiki_name = {}", wiki_name);
         trace!("calling = {:?}", rt.cli().subcommand_name());
 
-        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"))? {
             "list"        => list(&rt, wiki_name),
             "idof"        => idof(&rt, wiki_name),
             "create"      => create(&rt, wiki_name),
@@ -73,7 +73,7 @@ impl ImagApplication for ImagWiki {
                 if rt.handle_unknown_subcommand("imag-wiki", other, rt.cli())?.success() {
                     Ok(())
                 } else {
-                    Err(err_msg("Failed to handle unknown subcommand"))
+                    Err(anyhow!("Failed to handle unknown subcommand"))
                 }
             }
         } // end match scmd
@@ -110,7 +110,7 @@ fn list(rt: &Runtime, wiki_name: &str) -> Result<()> {
 
     rt.store()
         .get_wiki(wiki_name)?
-        .ok_or_else(|| format_err!("No wiki '{}' found", wiki_name))?
+        .ok_or_else(|| anyhow!("No wiki '{}' found", wiki_name))?
         .all_ids()?
         .and_then_ok(|id| writeln!(outlock, "{}{}", prefix, id).map_err(Error::from))
         .collect::<Result<Vec<_>>>()
@@ -130,9 +130,9 @@ fn idof(rt: &Runtime, wiki_name: &str) -> Result<()> {
 
     rt.store()
         .get_wiki(wiki_name)?
-        .ok_or_else(|| format_err!("No wiki '{}' found", wiki_name))?
+        .ok_or_else(|| anyhow!("No wiki '{}' found", wiki_name))?
         .get_entry(&entryname)?
-        .ok_or_else(|| format_err!("Entry '{}' in wiki '{}' not found!", entryname, wiki_name))
+        .ok_or_else(|| anyhow!("Entry '{}' in wiki '{}' not found!", entryname, wiki_name))
         .and_then(|entry| {
             let id     = entry.get_location().clone();
             let prefix = if scmd.is_present("idof-full") {
@@ -152,7 +152,7 @@ fn create(rt: &Runtime, wiki_name: &str) -> Result<()> {
     let wiki = rt
         .store()
         .get_wiki(&wiki_name)?
-        .ok_or_else(|| format_err!("No wiki '{}' found", wiki_name))?;
+        .ok_or_else(|| anyhow!("No wiki '{}' found", wiki_name))?;
 
     let mut entry = wiki.create_entry(name)?;
 
@@ -214,7 +214,7 @@ fn show(rt: &Runtime, wiki_name: &str) -> Result<()> {
     let wiki = rt
         .store()
         .get_wiki(&wiki_name)?
-        .ok_or_else(|| format_err!("No wiki '{}' found", wiki_name))?;
+        .ok_or_else(|| anyhow!("No wiki '{}' found", wiki_name))?;
 
     let out         = rt.stdout();
     let mut outlock = out.lock();
@@ -226,7 +226,7 @@ fn show(rt: &Runtime, wiki_name: &str) -> Result<()> {
         .map(|name| {
             let entry = wiki
                 .get_entry(&name)?
-                .ok_or_else(|| format_err!("No wiki entry '{}' found in wiki '{}'", name, wiki_name))?;
+                .ok_or_else(|| anyhow!("No wiki entry '{}' found in wiki '{}'", name, wiki_name))?;
 
             writeln!(outlock, "{}", entry.get_location())?;
             writeln!(outlock, "{}", entry.get_content())?;
@@ -247,11 +247,11 @@ fn delete(rt: &Runtime, wiki_name: &str) -> Result<()> {
     let wiki = rt
             .store()
             .get_wiki(&wiki_name)?
-            .ok_or_else(|| format_err!("No wiki '{}' found", wiki_name))?;
+            .ok_or_else(|| anyhow!("No wiki '{}' found", wiki_name))?;
 
     if unlink {
         wiki.get_entry(&name)?
-            .ok_or_else(|| format_err!("No wiki entry '{}' in '{}' found", name, wiki_name))?
+            .ok_or_else(|| anyhow!("No wiki entry '{}' in '{}' found", name, wiki_name))?
             .unlink(rt.store())?;
     }