From 08f4cbba07e66898debbfb496ffdcc648af2ea64 Mon Sep 17 00:00:00 2001
From: Rob Parrett <robparrett@gmail.com>
Date: Wed, 19 Oct 2022 18:54:37 +0000
Subject: [PATCH] Update clap requirement from 3.2 to 4.0 (#6303)

# Objective

Alternative to #6150

Dependabot's PR doesn't seem to break anything, but there are some deprecations that we might as well fix up.

## Solution

https://github.com/clap-rs/clap/blob/master/CHANGELOG.md#migrating

Update clap in `build-wasm-example` and `span-cmp`. Other tools don't use clap.

Remove references to `value_parser`. It's the default now.

Change `#[clap()]` to `#[arg()]`.

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 tools/build-wasm-example/Cargo.toml  | 2 +-
 tools/build-wasm-example/src/main.rs | 7 +++----
 tools/spancmp/Cargo.toml             | 2 +-
 tools/spancmp/src/main.rs            | 8 +++-----
 4 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/tools/build-wasm-example/Cargo.toml b/tools/build-wasm-example/Cargo.toml
index b0bf1bcffd293..6496c0fbb1b96 100644
--- a/tools/build-wasm-example/Cargo.toml
+++ b/tools/build-wasm-example/Cargo.toml
@@ -9,4 +9,4 @@ license = "MIT OR Apache-2.0"
 
 [dependencies]
 xshell = "0.2"
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.0", features = ["derive"] }
diff --git a/tools/build-wasm-example/src/main.rs b/tools/build-wasm-example/src/main.rs
index a86e7c8872c48..2124e75299530 100644
--- a/tools/build-wasm-example/src/main.rs
+++ b/tools/build-wasm-example/src/main.rs
@@ -6,18 +6,17 @@ use xshell::{cmd, Shell};
 #[derive(Parser, Debug)]
 struct Args {
     /// Examples to build
-    #[clap(value_parser)]
     examples: Vec<String>,
 
-    #[clap(short, long, value_parser)]
+    #[arg(short, long)]
     /// Run tests
     test: bool,
 
-    #[clap(short, long, value_parser)]
+    #[arg(short, long)]
     /// Run on the given browsers. By default, chromium, firefox, webkit
     browsers: Vec<String>,
 
-    #[clap(short, long, value_parser)]
+    #[arg(short, long)]
     /// Stop after this number of frames
     frames: Option<usize>,
 }
diff --git a/tools/spancmp/Cargo.toml b/tools/spancmp/Cargo.toml
index 613d786780d9a..7a2464691addc 100644
--- a/tools/spancmp/Cargo.toml
+++ b/tools/spancmp/Cargo.toml
@@ -9,7 +9,7 @@ license = "MIT OR Apache-2.0"
 [dependencies]
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.0", features = ["derive"] }
 regex = "1.5"
 termcolor = "1.1"
 bevy_utils = { path = "../../crates/bevy_utils", version = "0.9.0-dev" }
diff --git a/tools/spancmp/src/main.rs b/tools/spancmp/src/main.rs
index 540c50f1b1bdd..8cff9555780ec 100644
--- a/tools/spancmp/src/main.rs
+++ b/tools/spancmp/src/main.rs
@@ -15,22 +15,20 @@ mod pretty;
 
 #[derive(Parser, Debug)]
 struct Args {
-    #[clap(short, long, value_parser, default_value_t = 0.0)]
+    #[arg(short, long, default_value_t = 0.0)]
     /// Filter spans that have an average shorther than the threshold
     threshold: f32,
 
-    #[clap(short, long, value_parser)]
+    #[arg(short, long)]
     /// Filter spans by name matching the pattern
     pattern: Option<Regex>,
 
-    #[clap(short, long, value_parser)]
+    #[arg(short, long)]
     /// Simplify system names
     short: bool,
 
-    #[clap(value_parser)]
     trace: String,
     /// Optional, second trace to compare
-    #[clap(value_parser)]
     second_trace: Option<String>,
 }