summaryrefslogtreecommitdiffstats
path: root/ffi-macros/src/lib.rs
diff options
context:
space:
mode:
Diffstat (limited to 'ffi-macros/src/lib.rs')
-rw-r--r--ffi-macros/src/lib.rs12
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
},