diff --git a/Cargo.toml b/Cargo.toml index 359baa9..7476d0e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,10 +13,10 @@ homepage = "https://github.com/EmbarkStudios/ash-molten" documentation = "https://docs.rs/ash-molten" [dependencies] -ash = "0.29" +ash = "0.30" [features] external = [] [package.metadata.docs.rs] -default-target = "x86_64-apple-darwin" \ No newline at end of file +default-target = "x86_64-apple-darwin" diff --git a/build.rs b/build.rs index a2bd973..faea38c 100644 --- a/build.rs +++ b/build.rs @@ -7,7 +7,7 @@ mod mac { pub(crate) fn is_external_enabled() -> bool { std::env::vars() .filter_map(|(flag, _)| { - const NAME: &'static str = "CARGO_FEATURE_"; + const NAME: &str = "CARGO_FEATURE_"; if flag.starts_with(NAME) { let feature = flag.split(NAME).nth(1).expect("").to_string(); println!("{:?}", feature); @@ -15,8 +15,7 @@ mod mac { } None }) - .find(|f| f == "EXTERNAL") - .is_some() + .any(|f| f == "EXTERNAL") } pub(crate) fn build_molten>(target_dir: &P) -> &'static str { diff --git a/src/bin/main.rs b/src/bin/main.rs index 396ed40..4a52b6e 100644 --- a/src/bin/main.rs +++ b/src/bin/main.rs @@ -1,6 +1,6 @@ use ash::{ version::{EntryV1_0, InstanceV1_0}, - vk, vk_make_version, + vk, }; use std::ffi::CString; fn main() { @@ -13,7 +13,7 @@ fn main() { .application_version(0) .engine_name(&app_name) .engine_version(0) - .api_version(vk_make_version!(1, 0, 0)); + .api_version(vk::make_version(1, 0, 0)); let create_info = vk::InstanceCreateInfo::builder().application_info(&appinfo); let instance = entry.create_instance(&create_info, None).expect("Instance");