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

generator: Upgrade bindgen, heck and vk-parse

Browse source 
`heck` got its API slightly renamed, and `bindgen` fixed all code-smell
linter warnings in its output (except naming style, which is inherent).
This commit is contained in:
Marijn Suijten 2022-07-29 17:11:27 +02:00 committed by GitHub
parent e51e4158bd
commit 9cb6d386eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 5738 additions and 4265 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ash/src/vk.rs
View file

@ -28,8 +28,6 @@ mod prelude;
pub use prelude::*; pub use prelude::*;
/// Native bindings from Vulkan headers, generated by bindgen /// Native bindings from Vulkan headers, generated by bindgen
#[allow(nonstandard_style)] #[allow(nonstandard_style)]
#[allow(deref_nullptr)]
#[allow(trivial_casts, trivial_numeric_casts)]
pub mod native; pub mod native;
mod platform_types; mod platform_types;
pub use platform_types::*; pub use platform_types::*;

9988
ash/src/vk/native.rs
View file

File diff suppressed because it is too large Load diff

6
generator/Cargo.toml
View file

@ -5,15 +5,15 @@ authors = ["Maik Klein <maikklein@googlemail.com>"]
edition = "2018" edition = "2018"
[dependencies] [dependencies]
bindgen = "0.58" bindgen = "0.60"
heck = "0.3" heck = "0.4"
itertools = "0.10" itertools = "0.10"
nom = "7.1" nom = "7.1"
once_cell = "1.7" once_cell = "1.7"
proc-macro2 = "1.0" proc-macro2 = "1.0"
quote = "1.0" quote = "1.0"
regex = "1.4" regex = "1.4"
vk-parse = { version = "0.6", features = ["vkxml-convert"] } vk-parse = { version = "0.7", features = ["vkxml-convert"] }
vkxml = "0.3" vkxml = "0.3"
[dependencies.syn] [dependencies.syn]

7
generator/src/lib.rs
View file

@ -1,7 +1,7 @@
#![recursion_limit = "256"] #![recursion_limit = "256"]
#![warn(trivial_casts, trivial_numeric_casts)] #![warn(trivial_casts, trivial_numeric_casts)]
use heck::{CamelCase, ShoutySnakeCase, SnakeCase}; use heck::{ToShoutySnakeCase, ToSnakeCase, ToUpperCamelCase};
use itertools::Itertools; use itertools::Itertools;
use nom::sequence::pair; use nom::sequence::pair;
use nom::{ use nom::{
@ -1006,7 +1006,10 @@ pub fn generate_extension_commands<'a>(
let ident = format_ident!( let ident = format_ident!(
"{}Fn", "{}Fn",
extension_name.to_camel_case().strip_prefix("Vk").unwrap() extension_name
.to_upper_camel_case()
.strip_prefix("Vk")
.unwrap()
); );
let fp = generate_function_pointers(ident.clone(), &commands, &aliases, fn_cache); let fp = generate_function_pointers(ident.clone(), &commands, &aliases, fn_cache);