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

Fix nonsense Debug impl on non-char static arrays

Browse source
This commit is contained in:
Benjamin Saunders 2018-10-07 10:17:48 -07:00
parent c62172bdf8
commit d4789768a6
2 changed files with 1579 additions and 1948 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3523
ash/src/vk.rs
View file

File diff suppressed because it is too large Load diff

4
generator/src/lib.rs
View file

@ -1248,7 +1248,7 @@ pub fn derive_debug(_struct: &vkxml::Struct, union_types: &HashSet<&str>) -> Opt
.map(|n| n.contains("pfn")) .map(|n| n.contains("pfn"))
.unwrap_or(false) .unwrap_or(false)
}); });
let contains_static_array = members.clone().any(is_static_array); let contains_static_array = members.clone().any(|x| is_static_array(x) && x.basetype == "char");
let contains_union = members let contains_union = members
.clone() .clone()
.any(|field| union_types.contains(field.basetype.as_str())); .any(|field| union_types.contains(field.basetype.as_str()));
@ -1258,7 +1258,7 @@ pub fn derive_debug(_struct: &vkxml::Struct, union_types: &HashSet<&str>) -> Opt
let debug_fields = members.clone().map(|field| { let debug_fields = members.clone().map(|field| {
let param_ident = field.param_ident(); let param_ident = field.param_ident();
let param_str = param_ident.as_ref(); let param_str = param_ident.as_ref();
let debug_value = if is_static_array(field) { let debug_value = if is_static_array(field) && field.basetype == "char" {
quote!{ quote!{
&unsafe { &unsafe {
::std::ffi::CStr::from_ptr(self.#param_ident.as_ptr() as *const i8) ::std::ffi::CStr::from_ptr(self.#param_ident.as_ptr() as *const i8)