diff options
author | Neal H. Walfield <neal@pep.foundation> | 2019-05-31 23:04:09 +0200 |
---|---|---|
committer | Neal H. Walfield <neal@pep.foundation> | 2019-05-31 23:04:09 +0200 |
commit | ef2c5093158eab1f309995b7f7ea380d7172ec45 (patch) | |
tree | 500d75e567645004bb16672604f46d72b75ffb13 | |
parent | dc689ef1bbcbddf37c9a02a3c497eedad6154d03 (diff) |
ffi: Explicitly coerce errors to failure::Error
- Change ffi_try! to explicitly coerce errors to failure::Error so
that the caller doesn't need to do it.
-rw-r--r-- | openpgp-ffi/src/common.rs | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/openpgp-ffi/src/common.rs b/openpgp-ffi/src/common.rs index 1e7e40ee..32c42156 100644 --- a/openpgp-ffi/src/common.rs +++ b/openpgp-ffi/src/common.rs @@ -150,8 +150,10 @@ macro_rules! ffi_make_fry_from_errp { Ok(_) => ::error::Status::Success, Err(e) => { use MoveIntoRaw; + use failure::Error; let status = ::error::Status::from(&e); if let Some(errp) = $errp { + let e : Error = e.into(); *errp = e.move_into_raw(); } status @@ -171,7 +173,9 @@ macro_rules! ffi_make_fry_from_errp { Ok(v) => v, Err(e) => { use MoveIntoRaw; + use failure::Error; if let Some(errp) = $errp { + let e : Error = e.into(); *errp = e.move_into_raw(); } return $or; |