Merge pull request #687 from HuijingHei/bump-clap-4.5.9

deps: bump clap from 3.2.25 to 4.5
coreos · Jul 31, 2024 · 38c4b41 · 38c4b41
2 parents d89f83a + 4e2f402
commit 38c4b41
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 93 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -5,7 +5,7 @@ license = "Apache-2.0"
 version = "0.2.20"
 authors = ["Colin Walters <walters@verbum.org>"]
 edition = "2021"
-rust-version = "1.70.0"
+rust-version = "1.75.0"
 
 include = ["src", "LICENSE", "Makefile", "systemd"]
 
@@ -23,7 +23,7 @@ anyhow = "1.0"
 bincode = "1.3.2"
 cap-std-ext = "4.0.0"
 chrono = { version = "0.4.38", features = ["serde"] }
-clap = { version = "3.2", default-features = false, features = ["cargo", "derive", "std", "suggestions"] }
+clap = { version = "4.5", default-features = false, features = ["cargo", "derive", "std", "help", "usage", "suggestions"] }
 env_logger = "0.10"
 fn-error-context = "0.2.1"
 fs2 = "0.4.3"

diff --git a/src/cli/mod.rs b/src/cli/mod.rs
@@ -1,14 +1,13 @@
 //! Command-line interface (CLI) logic.
 
 use anyhow::Result;
-use clap::StructOpt;
+use clap::Parser;
 use log::LevelFilter;
-
 mod bootupctl;
 mod bootupd;
 
 /// Top-level multicall CLI.
-#[derive(Debug, StructOpt)]
+#[derive(Debug, Parser)]
 pub enum MultiCall {
     Ctl(bootupctl::CtlCommand),
     D(bootupd::DCommand),