Update clap (replacing structopt) (#1114)

Fixes the remaining security warning at https://github.com/EmbarkStudios/rust-gpu/security/dependabot
EmbarkStudios · Jan 10, 2024 · d0e3749 · d0e3749
1 parent baab3f6
commit d0e3749
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 124 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/examples/runners/ash/Cargo.toml b/examples/runners/ash/Cargo.toml
@@ -18,7 +18,7 @@ ash = "0.37"
 ash-window = "0.12"
 raw-window-handle = "0.5.1"
 winit = { version = "0.29.0", features = ["rwh_05"] }
-structopt = "0.3.20"
+clap = { version = "4", features = ["derive"] }
 cfg-if = "1.0.0"
 shared = { path = "../../shaders/shared" }
 spirv-builder = { workspace = true, default-features = false }

diff --git a/examples/runners/ash/src/main.rs b/examples/runners/ash/src/main.rs
@@ -93,22 +93,22 @@ use std::{
     thread,
 };
 
-use structopt::StructOpt;
+use clap::Parser;
 
 use spirv_builder::{MetadataPrintout, SpirvBuilder};
 
 use shared::ShaderConstants;
 
-#[derive(Debug, StructOpt)]
-#[structopt()]
+#[derive(Debug, Parser)]
+#[command()]
 pub struct Options {
     /// Use Vulkan debug layer (requires Vulkan SDK installed)
-    #[structopt(short, long)]
+    #[arg(short, long)]
     debug_layer: bool,
 }
 
 pub fn main() {
-    let options = Options::from_args();
+    let options = Options::parse();
     let shaders = compile_shaders();
 
     // runtime setup

diff --git a/examples/runners/wgpu/Cargo.toml b/examples/runners/wgpu/Cargo.toml
@@ -23,7 +23,7 @@ futures = { version = "0.3", default-features = false, features = ["std", "execu
 # Vulkan SDK or MoltenVK needs to be installed for `vulkan-portability` to work on macOS
 wgpu = { version = "0.18.0", features = ["spirv", "vulkan-portability"] }
 winit = { version = "0.29.0", features = ["android-native-activity", "rwh_05"] }
-structopt = "0.3"
+clap = { version = "4", features = ["derive"] }
 strum = { version = "0.23.0", default_features = false, features = ["std", "derive"] }
 bytemuck = "1.6.3"