summaryrefslogtreecommitdiffstats
path: root/openpgp-ffi/src/common.rs
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2019-01-29 14:50:39 +0100
committerJustus Winter <justus@sequoia-pgp.org>2019-01-29 17:41:26 +0100
commit442740975e41208c1cad300bc023ddedb04fc3a6 (patch)
tree01ef5d601e9aaed94c8700620ee2ee70bf91193b /openpgp-ffi/src/common.rs
parent51790b4fa46b41eba4c98b14a1193ad8e55b19b3 (diff)
openpgp-ffi: Explicitly convert to failure::Error.
Diffstat (limited to 'openpgp-ffi/src/common.rs')
-rw-r--r--openpgp-ffi/src/common.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/openpgp-ffi/src/common.rs b/openpgp-ffi/src/common.rs
index 0ad74ed9..bb21276f 100644
--- a/openpgp-ffi/src/common.rs
+++ b/openpgp-ffi/src/common.rs
@@ -607,7 +607,7 @@ fn verify_real<'a>(input: &'a mut Box<'a + Read>,
failure::Error::from_boxed_compat(e.into_inner().unwrap())
} else {
// Plain io::Error.
- e.into()
+ ::failure::Error::from(e)
}).context("Verification failed")?;
Ok(())
@@ -725,7 +725,7 @@ fn decrypt_real<'a>(input: &'a mut Box<'a + Read>,
failure::Error::from_boxed_compat(e.into_inner().unwrap())
} else {
// Plain io::Error.
- e.into()
+ ::failure::Error::from(e)
}).context("Decryption failed")?;
Ok(())