diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2019-01-29 14:16:30 +0100 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2019-01-29 17:41:26 +0100 |
| commit | e5f3ae121f39b46cbc0416acb4ba7049f40203d2 (patch) | |
| tree | 96b9c4881271006f76e8e3f6ff90cfe2335e8d20 /ffi-macros | |
| parent | 442740975e41208c1cad300bc023ddedb04fc3a6 (diff) | |
openpgp-ffi: Convert Error.
Diffstat (limited to 'ffi-macros')
| -rw-r--r-- | ffi-macros/src/lib.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ffi-macros/src/lib.rs b/ffi-macros/src/lib.rs index f9019151..9d486ba5 100644 --- a/ffi-macros/src/lib.rs +++ b/ffi-macros/src/lib.rs @@ -474,7 +474,7 @@ fn derive_conversion_functions(mut st: syn::ItemStruct, _: &str, _: &str, impl MoveResultIntoRaw<Option<::std::ptr::NonNull<#wrapper>>> for ::failure::Fallible<#wrapped> { - fn move_into_raw(self, errp: Option<&mut *mut ::failure::Error>) + fn move_into_raw(self, errp: Option<&mut *mut ::error::Error>) -> Option<::std::ptr::NonNull<#wrapper>> { match self { Ok(v) => { @@ -483,7 +483,7 @@ fn derive_conversion_functions(mut st: syn::ItemStruct, _: &str, _: &str, }, Err(e) => { if let Some(errp) = errp { - *errp = box_raw!(e); + *errp = e.move_into_raw(); } None }, @@ -494,7 +494,7 @@ fn derive_conversion_functions(mut st: syn::ItemStruct, _: &str, _: &str, impl MoveResultIntoRaw<Option<::std::ptr::NonNull<#wrapper>>> for ::failure::Fallible<&#wrapped> { - fn move_into_raw(self, errp: Option<&mut *mut ::failure::Error>) + fn move_into_raw(self, errp: Option<&mut *mut ::error::Error>) -> Option<::std::ptr::NonNull<#wrapper>> { match self { Ok(v) => { @@ -503,7 +503,7 @@ fn derive_conversion_functions(mut st: syn::ItemStruct, _: &str, _: &str, }, Err(e) => { if let Some(errp) = errp { - *errp = box_raw!(e); + *errp = e.move_into_raw(); } None }, @@ -514,7 +514,7 @@ fn derive_conversion_functions(mut st: syn::ItemStruct, _: &str, _: &str, impl MoveResultIntoRaw<Option<::std::ptr::NonNull<#wrapper>>> for ::failure::Fallible<&mut #wrapped> { - fn move_into_raw(self, errp: Option<&mut *mut ::failure::Error>) + fn move_into_raw(self, errp: Option<&mut *mut ::error::Error>) -> Option<::std::ptr::NonNull<#wrapper>> { match self { Ok(v) => { @@ -523,7 +523,7 @@ fn derive_conversion_functions(mut st: syn::ItemStruct, _: &str, _: &str, }, Err(e) => { if let Some(errp) = errp { - *errp = box_raw!(e); + *errp = e.move_into_raw(); } None }, |