Update to clap 4.2

Just keeping up with things.

Signed-off-by: Colin Walters <[email protected]>

Author: cgwalters

cli/Cargo.toml

@@ -19,7 +19,7 @@ platforms = ["x86_64-unknown-linux-gnu", "aarch64-unknown-linux-gnu", "powerpc64
 [dependencies]
 anyhow = "1.0"
 bootc-lib = { version = "0.1", path = "../lib" }
-clap = "3.2"
+clap = "4.2"
 libc = "0.2.92"
 tokio = { version = "1", features = ["macros"] }
 log = "0.4.0"

lib/Cargo.toml

@@ -12,8 +12,8 @@ rust-version = "1.64.0"
 anyhow = "1.0"
 camino = { version = "1.0.4", features = ["serde1"] }
 ostree-ext = "0.10.6"
-clap = { version= "3.2", features = ["derive"] }
-clap_mangen = { version = "0.1", optional = true }
+clap = { version= "4.2", features = ["derive"] }
+clap_mangen = { version = "0.2", optional = true }
 cap-std-ext = "1.0.1"
 hex = "^0.4"
 fn-error-context = "0.2.0"

lib/src/docgen.rs

@@ -36,6 +36,10 @@ fn generate_one(directory: &Utf8Path, cmd: Command) -> Result<()> {
 
     for subcmd in cmd.get_subcommands().filter(|c| !c.is_hide_set()) {
         let subname = format!("{}-{}", name, subcmd.get_name());
+        // SAFETY: Latest clap 4 requires names are &'static - this is
+        // not long-running production code, so we just leak the names here.
+        let subname = &*std::boxed::Box::leak(subname.into_boxed_str());
+        let subcmd = subcmd.clone().name(subname).alias(subname).version(version);
         generate_one(directory, subcmd.clone().name(subname).version(version))?;
     }
     Ok(())

lib/src/install/baseline.rs

@@ -17,7 +17,7 @@ use camino::Utf8Path;
 use camino::Utf8PathBuf;
 use cap_std::fs::Dir;
 use cap_std_ext::cap_std;
-use clap::ArgEnum;
+use clap::ValueEnum;
 use fn_error_context::context;
 use serde::{Deserialize, Serialize};