From 3c1130377a2206a015b5a192d57313602fd9ab52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Oct 2022 06:04:03 +0000
Subject: [PATCH 1/2] Update clap requirement from 3.2 to 4.0

Updates the requirements on [clap](https://github.com/clap-rs/clap) to permit the latest version.
- [Release notes](https://github.com/clap-rs/clap/releases)
- [Changelog](https://github.com/clap-rs/clap/blob/master/CHANGELOG.md)
- [Commits](https://github.com/clap-rs/clap/compare/clap_complete-v3.2.0...v4.0.8)

---
updated-dependencies:
- dependency-name: clap
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 tools/build-wasm-example/Cargo.toml | 2 +-
 tools/spancmp/Cargo.toml            | 2 +-
 2 files changed, 2 insertions(+), 2 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/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" }

From 9b2e7b5fef4f63c394982908f96c082a566f4e87 Mon Sep 17 00:00:00 2001
From: Rob Parrett <robparrett@gmail.com>
Date: Wed, 19 Oct 2022 11:35:51 -0700
Subject: [PATCH 2/2] Fix clap deprecations

---
 tools/build-wasm-example/src/main.rs | 7 +++----
 tools/spancmp/src/main.rs            | 8 +++-----
 2 files changed, 6 insertions(+), 9 deletions(-)

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/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>,
 }