rename placeholder integration_type to integration

Author: Firestar99

ash-graphics/Cargo.toml.liquid

@@ -16,11 +16,11 @@ repository = ""
 unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] }
 
 [workspace.dependencies]
-{% if integration_type == "spirv-builder" -%}
+{% if integration == "spirv-builder" -%}
 # The version of the dependencies `spirv-builder` and `spirv-std` must match exactly!
 spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
 {% endif -%}
-{% if integration_type == "cargo-gpu" -%}
+{% if integration == "cargo-gpu" -%}
 cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "bf24eb6060e0c7b0013eceddd23b5d7cee68f4cc" }
 {% endif -%}
 spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "6fb875068d0d35b1a81ae89b73cf7a464f8c60f7" }
@@ -34,7 +34,7 @@ winit = "0.30.0"
 cfg-if = "1.0.0"
 anyhow = "1.0.98"
 
-{% if integration_type == "spirv-builder" -%}
+{% if integration == "spirv-builder" -%}
 # Optimize build scripts, copied from rust-gpu's repo
 # Enable incremental by default in release mode.
 [profile.release]

ash-graphics/ash-graphics/Cargo.toml.liquid

@@ -10,7 +10,7 @@ repository.workspace = true
 [lints]
 workspace = true
 
-{% if integration_type == "spirv-builder" -%}
+{% if integration == "spirv-builder" -%}
 [features]
 default = ["use-compiled-tools"]
 use-installed-tools = ["spirv-builder/use-installed-tools"]
@@ -28,10 +28,10 @@ anyhow.workspace = true
 bytemuck.workspace = true
 
 [build-dependencies]
-{% if integration_type == "spirv-builder" -%}
+{% if integration == "spirv-builder" -%}
 spirv-builder.workspace = true
 {% endif -%}
-{% if integration_type == "cargo-gpu" -%}
+{% if integration == "cargo-gpu" -%}
 cargo-gpu.workspace = true
 {% endif -%}
 anyhow.workspace = true

ash-graphics/ash-graphics/build.rs.liquid

@@ -1,7 +1,7 @@
-{% if integration_type == "spirv-builder" -%}
+{% if integration == "spirv-builder" -%}
 use spirv_builder::{MetadataPrintout, ShaderPanicStrategy, SpirvBuilder};
 {% endif -%}
-{% if integration_type == "cargo-gpu" -%}
+{% if integration == "cargo-gpu" -%}
 use cargo_gpu::Install;
 use cargo_gpu::spirv_builder::{MetadataPrintout, ShaderPanicStrategy};
 {% endif -%}
@@ -14,10 +14,10 @@ pub fn main() -> anyhow::Result<()> {
         .copied()
         .collect::<PathBuf>();
 
-    {% if integration_type == "spirv-builder" -%}
+    {% if integration == "spirv-builder" -%}
     let mut builder = SpirvBuilder::new(crate_path, "spirv-unknown-vulkan1.3");
     {% endif -%}
-    {% if integration_type == "cargo-gpu" -%}
+    {% if integration == "cargo-gpu" -%}
     let install = Install::from_shader_crate(crate_path.clone()).run()?;
     let mut builder = install.to_spirv_builder(crate_path, "spirv-unknown-vulkan1.3");
     {% endif -%}

ash-graphics/cargo-generate.toml

@@ -3,7 +3,7 @@ ignore = ["target"]
 exclude = ["target"]
 
 [placeholders]
-integration_type = { prompt = "What integration type?", choices = ["cargo-gpu", "spirv-builder"], default = "cargo-gpu", type = "string" }
+integration = { prompt = "What integration type?", choices = ["cargo-gpu", "spirv-builder"], default = "cargo-gpu", type = "string" }
 
-[conditional.'integration_type != "spirv-builder"']
-ignore = [ "rust-toolchain.toml" ]
+[conditional.'integration != "spirv-builder"']
+ignore = [ "rust-toolchain.toml" ]

xtask/src/generate.rs

@@ -40,7 +40,7 @@ impl clap::ValueEnum for Values {
 impl Values {
     pub fn key(&self) -> Placeholders {
         match self {
-            Values::CargoGpu | Values::SpirvBuilder => Placeholders::IntegrationType,
+            Values::CargoGpu | Values::SpirvBuilder => Placeholders::Integration,
         }
     }
 
@@ -52,8 +52,8 @@ impl Values {
 #[repr(u32)]
 #[derive(Copy, Clone, Eq, PartialEq, Hash, Display, EnumString, IntoStaticStr, VariantArray)]
 pub enum Placeholders {
-    #[strum(to_string = "integration_type")]
-    IntegrationType,
+    #[strum(to_string = "integration")]
+    Integration,
 }
 
 impl Debug for Placeholders {