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

Merge #172

Browse source 
172: Builder: fix &'a [c_void] to &'a [8u] r=MaikKlein a=MatusT

Fix https://github.com/MaikKlein/ash/issues/155. There is a lot of noise because I already used 1.0.0 stable version of rustfmt. 

Probably merge the https://github.com/MaikKlein/ash/pull/171 first and I'll rebase then.

Co-authored-by: Matus Talcik <matus.talcik@outlook>
This commit is contained in:
bors[bot] 2018-12-09 11:08:42 +00:00
parent 43eabee68a 6497e2f58c
commit 91e6eed93a
2 changed files with 2168 additions and 2164 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4304
ash/src/vk.rs
View file

File diff suppressed because it is too large Load diff

28
generator/src/lib.rs
View file

@ -1497,26 +1497,36 @@ pub fn derive_setters(_struct: &vkxml::Struct) -> Option<Tokens> {
} }
let slice_param_ty_tokens; let slice_param_ty_tokens;
let ptr_mutability; let ptr;
if param_ty_string.starts_with("*const ") { if param_ty_string.starts_with("*const ") {
slice_param_ty_tokens = let slice_type = &param_ty_string[7..];
"&'a [".to_string() + &param_ty_string[7..] + "]"; if slice_type == "c_void" {
ptr_mutability = ".as_ptr()"; slice_param_ty_tokens = "&'a [u8]".to_string();
ptr = ".as_ptr() as *const c_void";
} else {
slice_param_ty_tokens = "&'a [".to_string() + slice_type + "]";
ptr = ".as_ptr()";
}
} else { } else {
// *mut // *mut
slice_param_ty_tokens = let slice_type = &param_ty_string[5..];
"&'a mut [".to_string() + &param_ty_string[5..] + "]"; if slice_type == "c_void" {
ptr_mutability = ".as_mut_ptr()"; slice_param_ty_tokens = "&mut 'a [u8]".to_string();
ptr = ".as_mut_ptr() as *mut c_void";
} else {
slice_param_ty_tokens = "&'a mut [".to_string() + slice_type + "]";
ptr = ".as_mut_ptr()";
}
} }
let slice_param_ty_tokens = Term::intern(&slice_param_ty_tokens); let slice_param_ty_tokens = Term::intern(&slice_param_ty_tokens);
let ptr_mutability = Term::intern(ptr_mutability); let ptr = Term::intern(ptr);
match array_type { match array_type {
vkxml::ArrayType::Dynamic => { vkxml::ArrayType::Dynamic => {
return Some(quote!{ return Some(quote!{
pub fn #param_ident_short(mut self, #param_ident_short: #slice_param_ty_tokens) -> #name_builder<'a> { pub fn #param_ident_short(mut self, #param_ident_short: #slice_param_ty_tokens) -> #name_builder<'a> {
self.inner.#array_size_ident = #param_ident_short.len() as _; self.inner.#array_size_ident = #param_ident_short.len() as _;
self.inner.#param_ident = #param_ident_short#ptr_mutability; self.inner.#param_ident = #param_ident_short#ptr;
self self
} }
}); });