bump clap

cross-rs · Jun 14, 2022 · 81ac368 · 81ac368
1 parent 3202547
commit 81ac368
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,8 +18,7 @@ members = ["xtask"]
 
 [dependencies]
 atty = "0.2"
-# Pinned until further action to migrate to newer clap, see https://github.com/clap-rs/clap/issues/3822#issuecomment-1154069623
-clap = { version = "~3.1", features = ["derive"] }
+clap = { version = "3.2.2", features = ["derive", "unstable-v4"] }
 color-eyre = "0.6"
 eyre = "0.6"
 thiserror = "1"

diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -12,7 +12,7 @@ cross = { path = "..", features = ["dev"] }
 walkdir = { version = "2" }
 color-eyre = "0.6"
 eyre = "0.6"
-clap = { version = "~3.1", features = ["derive", "env"] }
+clap = { version = "3.1", features = ["derive", "env", "unstable-v4"] }
 which = { version = "4", default_features = false }
 serde = { version = "1", features = ["derive"] }
 serde_yaml = "0.8"
diff --git a/xtask/src/build_docker_image.rs b/xtask/src/build_docker_image.rs
@@ -28,7 +28,11 @@ pub struct BuildDockerImage {
     force: bool,
     #[clap(short, long)]
     push: bool,
-    #[clap(long, possible_values = ["auto", "plain", "tty"], default_value = "auto")]
+    #[clap(
+        long,
+        value_parser = clap::builder::PossibleValuesParser::new(["auto", "plain", "tty"]), 
+        default_value = "auto"
+    )]
     progress: String,
     #[clap(long)]
     no_cache: bool,