topjohnwu/cxx
1
0
Fork 0
mirror of https://github.com/topjohnwu/cxx.git synced 2025-02-23 17:40:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Enable UniquePtr::new for enums

Browse Source
This commit is contained in:
David Tolnay 2020-11-25 07:14:12 -08:00
parent 4f52dabfa3
commit 15609ab97b
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gen/src/write.rs
View File

@ -1212,6 +1212,7 @@ fn write_unique_ptr_common(out: &mut OutFile, ty: &Type) {
// for Opaque types because the 'new' method is not implemented.
Type::Ident(ident) => {
out.types.structs.contains_key(&ident.rust)
|| out.types.enums.contains_key(&ident.rust)
|| out.types.aliases.contains_key(&ident.rust)
}
_ => false,

32
macro/src/expand.rs
View File

@ -909,22 +909,24 @@ fn expand_unique_ptr(
let link_release = format!("{}release", prefix);
let link_drop = format!("{}drop", prefix);
let new_method =
if types.structs.contains_key(&ident.rust) || types.aliases.contains_key(&ident.rust) {
Some(quote! {
fn __new(mut value: Self) -> *mut ::std::ffi::c_void {
extern "C" {
#[link_name = #link_new]
fn __new(this: *mut *mut ::std::ffi::c_void, value: *mut #ident);
}
let mut repr = ::std::ptr::null_mut::<::std::ffi::c_void>();
unsafe { __new(&mut repr, &mut value) }
repr
let can_construct_from_value = types.structs.contains_key(&ident.rust)
|| types.enums.contains_key(&ident.rust)
|| types.aliases.contains_key(&ident.rust);
let new_method = if can_construct_from_value {
Some(quote! {
fn __new(mut value: Self) -> *mut ::std::ffi::c_void {
extern "C" {
#[link_name = #link_new]
fn __new(this: *mut *mut ::std::ffi::c_void, value: *mut #ident);
}
})
} else {
None
};
let mut repr = ::std::ptr::null_mut::<::std::ffi::c_void>();
unsafe { __new(&mut repr, &mut value) }
repr
}
})
} else {
None
};
let begin_span =
explicit_impl.map_or_else(Span::call_site, |explicit| explicit.impl_token.span);