alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix extension trait implementations, tweak naming

Browse source 
These were being implemented for the trait object of the extension
struct's own extension trait, instead of the extension struct itself.
This commit is contained in:
Benjamin Saunders 2018-11-30 17:43:34 -08:00
parent bcaa563c5b
commit fc1625e81c
2 changed files with 2633 additions and 2747 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5368
ash/src/vk.rs
View file

File diff suppressed because it is too large Load diff

12
generator/src/lib.rs
View file

@ -1539,12 +1539,12 @@ pub fn derive_setters(_struct: &vkxml::Struct) -> Option<Tokens> {
}); });
let mut nexts = Vec::new(); let mut nexts = Vec::new();
let name_builder_next = name_to_tokens(&(_struct.name.clone() + "BuilderNext")); let extends_name = name_to_tokens(&format!("Extends{}", name));
if let Some(extends) = &_struct.extends { if let Some(extends) = &_struct.extends {
for target in extends.split(',') { for target in extends.split(',') {
let target_ident = name_to_tokens(&(target.to_string() + "BuilderNext")); let target_ident = name_to_tokens(&format!("Extends{}", name_to_tokens(target)));
nexts.push(quote! { nexts.push(quote! {
unsafe impl #target_ident for #name_builder_next {} unsafe impl #target_ident for #name {}
}); });
} }
} }
@ -1552,14 +1552,14 @@ pub fn derive_setters(_struct: &vkxml::Struct) -> Option<Tokens> {
let next_function = if has_next { let next_function = if has_next {
if is_next_const { if is_next_const {
quote!{ quote!{
pub fn next<T>(mut self, next: &'a T) -> #name_builder<'a> where T: #name_builder_next { pub fn next<T>(mut self, next: &'a T) -> #name_builder<'a> where T: #extends_name {
self.inner.p_next = next as *const T as *const c_void; self.inner.p_next = next as *const T as *const c_void;
self self
} }
} }
} else { } else {
quote!{ quote!{
pub fn next<T>(mut self, next: &'a mut T) -> #name_builder<'a> where T: #name_builder_next { pub fn next<T>(mut self, next: &'a mut T) -> #name_builder<'a> where T: #extends_name {
self.inner.p_next = next as *mut T as *mut c_void; self.inner.p_next = next as *mut T as *mut c_void;
self self
} }
@ -1584,7 +1584,7 @@ pub fn derive_setters(_struct: &vkxml::Struct) -> Option<Tokens> {
marker: ::std::marker::PhantomData<&'a ()>, marker: ::std::marker::PhantomData<&'a ()>,
} }
pub unsafe trait #name_builder_next {} pub unsafe trait #extends_name {}
#(#nexts)* #(#nexts)*