Merge #1038

1038: upgrade to clap 4.0 r=Alexhuszagh a=Emilgardis



Co-authored-by: Emil Gardström <emil.gardstrom@gmail.com>

Author: bors[bot]

.changes/1038.json

@@ -0,0 +1,6 @@
+[
+    {
+        "description": "bump MSRV to 1.60",
+        "type": "internal"
+    }
+]

.github/workflows/ci.yml

@@ -52,8 +52,7 @@ jobs:
       - uses: ./.github/actions/setup-rust
         with:
           components: clippy
-          toolchain: 1.58.1 # MSRV, Minimally Supported Rust Version. Make sure to update README.md
-
+          toolchain: 1.60.0 # MSRV, Minimally Supported Rust Version. Make sure to update README.md
       - name: Run clippy
         run: cargo clippy --locked --all-targets --all-features --workspace -- -D warnings
   test:

Cargo.lock

@@ -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"

Cargo.toml

@@ -431,7 +431,7 @@ $ QEMU_STRACE=1 cross run --target aarch64-unknown-linux-gnu
 
 ## Minimum Supported Rust Version (MSRV)
 
-This crate is guaranteed to compile on stable Rust 1.58.1 and up. It *might*
+This crate is guaranteed to compile on stable Rust 1.60.0 and up. It *might*
 compile with older versions but that may change in any new patch release.
 
 Some cross-compilation targets require a later Rust version, and using Xargo

README.md

@@ -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"

xtask/Cargo.toml

@@ -66,7 +66,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>,
@@ -76,7 +76,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,