Update clap to v4

Author: Mark-Simulacrum

Cargo.lock

@@ -6,7 +6,7 @@ edition = "2018"
 description = "Collects Rust performance data"
 
 [dependencies]
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.1", features = ["derive"] }
 env_logger = "0.10"
 anyhow = "1"
 thiserror = "1"

collector/Cargo.toml

@@ -12,7 +12,7 @@ serde = { version = "1.0.143", features = ["derive"] }
 serde_json = "1.0.83"
 log = "0.4.17"
 env_logger = "0.10.0"
-clap = { version = "3.2", features = ["derive"] }
+clap = { version = "4.1", features = ["derive", "string"] }
 libc = "0.2"
 
 [target.'cfg(target_os = "linux")'.dependencies]

collector/benchlib/Cargo.toml

@@ -11,18 +11,26 @@ pub enum Args {
 #[derive(clap::Parser, Debug)]
 pub struct BenchmarkArgs {
     /// How many times should each benchmark be repeated.
-    #[clap(long, default_value = "5")]
+    #[arg(long, default_value = "5")]
     pub iterations: u32,
 
     /// Exclude all benchmarks matching a prefix in this comma-separated list
-    #[clap(long)]
+    #[arg(long)]
     pub exclude: Option<String>,
 
     /// Include only benchmarks matching a prefix in this comma-separated list
-    #[clap(long)]
+    #[arg(long)]
     pub include: Option<String>,
 }
 
+#[test]
+fn verify_cli() {
+    // By default, clap lazily checks subcommands. This provides eager testing
+    // without having to run the binary for each subcommand.
+    use clap::CommandFactory;
+    Args::command().debug_assert()
+}
+
 pub fn parse_cli() -> anyhow::Result<Args> {
     let app = Args::command();
 
@@ -31,6 +39,7 @@ pub fn parse_cli() -> anyhow::Result<Args> {
         std::env::current_exe()?
             .file_name()
             .and_then(|s| s.to_str())
+            .map(|s| s.to_owned())
             .expect("Binary name not found"),
     );
 

collector/benchlib/src/cli.rs

@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use std::fmt;
 
-#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize, clap::ArgEnum)]
+#[derive(Debug, Clone, Copy, PartialEq, Serialize, Deserialize, clap::ValueEnum)]
 #[serde(rename_all = "kebab-case")]
 pub enum Category {
     Primary,

collector/src/benchmark/category.rs

@@ -5,8 +5,8 @@
 // to the database crate.
 // In general, the database versions of types used in the collector should be considered a DB
 // implementation detail, as they may change when we alter database layout.
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, clap::ArgEnum, serde::Deserialize)]
-#[clap(rename_all = "PascalCase")]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, clap::ValueEnum, serde::Deserialize)]
+#[value(rename_all = "PascalCase")]
 pub enum Profile {
     Check,
     Debug,

collector/src/benchmark/profile.rs

@@ -1,5 +1,5 @@
-#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, clap::ArgEnum, serde::Deserialize)]
-#[clap(rename_all = "PascalCase")]
+#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, clap::ValueEnum, serde::Deserialize)]
+#[value(rename_all = "PascalCase")]
 pub enum Scenario {
     Full,
     IncrFull,