Fix libimagmail for anyhow usage

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

4 files changed, 12 insertions, 11 deletions

diff --git a/lib/domain/libimagmail/Cargo.toml b/lib/domain/libimagmail/Cargo.toml
index 84d56dd3..b09739d7 100644
--- a/lib/domain/libimagmail/Cargo.toml
+++ b/lib/domain/libimagmail/Cargo.toml
@@ -24,6 +24,7 @@ log = "0.4"
 toml = "0.5"
 toml-query = "0.10"
 filters = "0.3.0"
+anyhow = "1"
 failure = "0.1"
 resiter = "0.4"
 notmuch = "0.6"
diff --git a/lib/domain/libimagmail/src/mail.rs b/lib/domain/libimagmail/src/mail.rs
index 3d9dec12..72b55ab6 100644
--- a/lib/domain/libimagmail/src/mail.rs
+++ b/lib/domain/libimagmail/src/mail.rs
@@ -23,8 +23,8 @@ use std::io::Read;
 use std::fmt::{Debug, Result as FmtResult, Formatter};
 use std::ops::Deref;
 
-use failure::Fallible as Result;
-use failure::Error;
+use anyhow::Result;
+use anyhow::Error;
 use toml_query::read::TomlValueReadTypeExt;
 use chrono::NaiveDateTime;
 use mda::Email;
@@ -170,7 +170,7 @@ impl LoadedMail {
 
         Ok(ParsedMail {
             loaded: self,
-            parsed: Email::from_vec(buffer).map_err(|e| format_err!("Parser error: {}", e.description()))?,
+            parsed: Email::from_vec(buffer).map_err(|e| format_err!("Parser error: {}", e))?,
         })
     }
 }
diff --git a/lib/domain/libimagmail/src/notmuch/connection.rs b/lib/domain/libimagmail/src/notmuch/connection.rs
index 06aebb98..0d57e219 100644
--- a/lib/domain/libimagmail/src/notmuch/connection.rs
+++ b/lib/domain/libimagmail/src/notmuch/connection.rs
@@ -21,12 +21,12 @@ use std::sync::Mutex;
 use std::sync::Arc;
 use std::path::Path;
 
-use failure::Fallible as Result;
-use failure::Error;
+use anyhow::Result;
+use anyhow::Error;
 use notmuch_rs::Database;
 use notmuch_rs::DatabaseMode;
 
-use libimagerror::errors::ErrorMsg;
+use libimagerror::errors::Error as ErrorMsg;
 
 #[derive(Debug)]
 pub struct NotmuchConnection {
diff --git a/lib/domain/libimagmail/src/store.rs b/lib/domain/libimagmail/src/store.rs
index 2e1077d4..ec9b4197 100644
--- a/lib/domain/libimagmail/src/store.rs
+++ b/lib/domain/libimagmail/src/store.rs
@@ -20,9 +20,9 @@
 use std::borrow::Cow;
 use std::ops::Deref;
 
-use failure::Fallible as Result;
-use failure::ResultExt;
-use failure::Error;
+use anyhow::Result;
+use anyhow::Error;
+use anyhow::Context;
 use toml_query::insert::TomlValueInsertExt;
 use toml::Value;
 use notmuch_rs::Sort as NotmuchSorting;
@@ -156,7 +156,7 @@ impl<'a> MailStoreWithConnection<'a> {
         let sid = crate::module_path::new_id(id.as_ref())?;
         self.store
             .get(sid)
-            .with_context(|_| format!("Getting entry for Id: {}", id.as_ref()))
+            .with_context(|| format!("Getting entry for Id: {}", id.as_ref()))
             .map_err(Error::from)
     }
 
@@ -164,7 +164,7 @@ impl<'a> MailStoreWithConnection<'a> {
         let sid = crate::module_path::new_id(id)?;
         self.store
             .exists(sid)
-            .with_context(|_| format!("Checking whether entry exists for Id: {}", id))
+            .with_context(|| format!("Checking whether entry exists for Id: {}", id))
             .map_err(Error::from)
     }