upgrade to clap 4.0

Emilgardis · Emilgardis · commit ffe72a0f954c · 2022-10-04T11:09:12.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -27,7 +27,7 @@ members = ["xtask"]
 
 [dependencies]
 atty = "0.2"
-clap = { version = "3.2.22", features = ["derive", "unstable-v4"] }
+clap = { version = "4.0", features = ["derive"] }
 color-eyre = { version = "0.6.2", default-features = false, features = ["track-caller"] }
 eyre = "0.6"
 thiserror = "1"
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -13,7 +13,7 @@ cross = { path = "..", features = ["dev"] }
 walkdir = "2.3.2"
 color-eyre = "0.6.2"
 eyre = "0.6.8"
-clap = { version = "3.2.22", features = ["derive", "env", "unstable-v4"] }
+clap = { version = "4.0", features = ["derive", "env"] }
 which = { version = "4.2", default_features = false }
 serde = { version = "1", features = ["derive"] }
 serde_json = "1.0"
diff --git a/xtask/src/ci/target_matrix.rs b/xtask/src/ci/target_matrix.rs
@@ -64,7 +64,7 @@ struct TargetMatrixElement<'a> {
 #[derive(Parser, Debug)]
 #[clap(no_binary_name = true)]
 struct TargetMatrixArgs {
-    #[clap(long, short, multiple_values = true)]
+    #[clap(long, short, num_args = 0..)]
     target: Vec<String>,
     #[clap(long, value_parser = BoolishValueParser::new())]
     std: Option<bool>,
@@ -74,7 +74,7 @@ struct TargetMatrixArgs {
     dylib: Option<bool>,
     #[clap(long, value_parser = BoolishValueParser::new())]
     run: Option<bool>,
-    #[clap(long, short, multiple_values = true)]
+    #[clap(long, short, num_args = 0..)]
     runners: Vec<String>,
     #[clap(long)]
     none: bool,
