diff options
author | Justus Winter <justus@sequoia-pgp.org> | 2020-03-09 11:42:45 +0100 |
---|---|---|
committer | Justus Winter <justus@sequoia-pgp.org> | 2020-03-09 18:09:50 +0100 |
commit | 391a4b92c977cd64dfd131f3e29b0bc8d756d064 (patch) | |
tree | b5b96ff935853cef9ee22e01890c248a791e724e /openpgp/src/message | |
parent | 58d662c6d37dd1b0dccd4d0ce30290b8ede408e9 (diff) |
Switch from failure to anyhow.
- Use the anyhow crate instead of failure to implement the dynamic
side of our error handling. anyhow::Error derefs to dyn
std::error::Error, allowing better interoperability with other
stdlib-based error handling libraries.
- Fixes #444.
Diffstat (limited to 'openpgp/src/message')
-rw-r--r-- | openpgp/src/message/mod.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/openpgp/src/message/mod.rs b/openpgp/src/message/mod.rs index 5e1c2fba..7ec6d0ef 100644 --- a/openpgp/src/message/mod.rs +++ b/openpgp/src/message/mod.rs @@ -14,8 +14,6 @@ use std::fmt; use std::io; use std::path::Path; -use failure; - use crate::Result; use crate::Error; use crate::Packet; @@ -51,7 +49,7 @@ pub enum MessageParserError { #[doc(hidden)] __Nonexhaustive, } -impl From<MessageParserError> for failure::Error { +impl From<MessageParserError> for anyhow::Error { fn from(err: MessageParserError) -> Self { match err { MessageParserError::Parser(p) => p.into(), @@ -72,7 +70,7 @@ pub enum MessageValidity { /// prefix of an OpenPGP message. MessagePrefix, /// The message is definitely not valid. - Error(failure::Error), + Error(anyhow::Error), } impl MessageValidity { @@ -347,7 +345,7 @@ impl<'a> Parse<'a, Message> for Message { } impl std::str::FromStr for Message { - type Err = failure::Error; + type Err = anyhow::Error; fn from_str(s: &str) -> std::result::Result<Self, Self::Err> { Self::from_bytes(s.as_bytes()) |