Migrate hermetic_infra/ from Clap 3 to Clap 4

Summary:
This is a Claude Code generated diff stack to migrate all existing users of Clap 3 to Clap 4. It follows CLI Foundation ["Clap 4 Migration"](https://www.internalfb.com/wiki/CLI_Foundation/Guidelines_&_How_To/Frameworks_&_Main_Libraries/Rust/Clap_4_Migration/) wiki and "clap4-migration" Claude skill based on it and the Clap changelogs.

[Clap 2 and 3 have been deprecated for over 3 years.](https://fb.workplace.com/groups/clifoundation/posts/753507606006249/) They will be deleted soon and this should make it much easier for everyone to move over.

Sandcastle should be green indicating that the CLI builds succesfully and any tests related should be good too. Considering there are over a hundred CLIs using Clap 2 and 3, this as good of a signal we are able of getting. If you need more signal, we highly recommend you to look into [Scrut](https://www.internalfb.com/intern/staticdocs/scrut/docs/), an end-to-end CLI testing toolkit. Though this is outside of the scope for this massive diff stack.

If you want additional assurances that you can roll back. You might want to have a look at [`cli.deployer`](https://www.internalfb.com/wiki/Cli.deployer/)

**Please make sure to review the diff in case of any issues. There might be some slight changes to the CLI due to the large amount of changes that have been seen in Clap over the last years. If you want to make further changes, please make a new diff rebased on this one and they can land them together.**

 ---

reverie-util: parse(try_from_str)→value_parser, number_of_values→num_args, from_iter_safe→try_parse_from. 9 examples: from_args→parse. Also sanitization-clear, bareclient, iris-subscriber, dependency_service, chip, observability_service BUCK deps.

Reviewed By: dtolnay

Differential Revision: D92826701

fbshipit-source-id: 644a0915ad8f7933b92fb32e6456a928a96957fb

Author: AndreasBackx

detcore-model/Cargo.toml

@@ -12,7 +12,7 @@ anyhow = "1.0.98"
 bitvec = { version = "1.0", features = ["atomic", "serde"] }
 bytesize = "2.0"
 chrono = { version = "0.4.41", features = ["clock", "serde", "std"], default-features = false }
-clap = { version = "3.2.25", features = ["derive", "env", "regex", "unicode", "wrap_help"] }
+clap = { version = "4.5.42", features = ["derive", "env", "string", "unicode", "wrap_help"] }
 libc = "0.2.139"
 nix = { version = "0.30.1", features = ["dir", "event", "hostname", "inotify", "ioctl", "mman", "mount", "net", "poll", "ptrace", "reboot", "resource", "sched", "signal", "term", "time", "user", "zerocopy"] }
 reverie-syscalls = { version = "0.1.0", git = "https://github.com/facebookexperimental/reverie.git", branch = "main" }

detcore-model/src/config.rs

@@ -28,11 +28,11 @@ use crate::schedule::SigWrapper;
 #[derive(Debug, Serialize, Deserialize, Clone, Parser)]
 pub struct Config {
     /// Disable virtual/logical time. Note that virtual time is required for virtual metadata.
-    #[clap(long = "no-virtualize-time", parse(from_flag = std::ops::Not::not))]
+    #[clap(long = "no-virtualize-time", action = clap::ArgAction::SetFalse)]
     pub virtualize_time: bool,
 
     /// Disable virtual cpuid
-    #[clap(long = "no-virtualize-cpuid", parse(from_flag = std::ops::Not::not))]
+    #[clap(long = "no-virtualize-cpuid", action = clap::ArgAction::SetFalse)]
     pub virtualize_cpuid: bool,
 
     /// Epoch of the logical time.
@@ -77,7 +77,7 @@ pub struct Config {
 
     /// Disable substitution of virtual (deterministic) file metadata, in lieu
     /// of the real metadata returned by `fstat`, implies `virtualize_time`.
-    #[clap(long = "no-virtualize-metadata", parse(from_flag = std::ops::Not::not))]
+    #[clap(long = "no-virtualize-metadata", action = clap::ArgAction::SetFalse)]
     pub virtualize_metadata: bool,
 
     /// Sequentialize thread execution deterministically.
@@ -114,15 +114,15 @@ pub struct Config {
 
     /// JSON file to read recorded preemptions from.  When `--chaos` mode is activated, these
     /// recorded preemption points take the place of randomized scheduling decisions.
-    #[clap(long, value_name = "filepath", conflicts_with = "replay-schedule-from")]
+    #[clap(long, value_name = "filepath", conflicts_with = "replay_schedule_from")]
     pub replay_preemptions_from: Option<PathBuf>,
 
     /// File to read recorded schedule trace from. This execution will replay the schedule verbatim
     /// from the file.
     #[clap(
         long,
         value_name = "filepath",
-        conflicts_with = "replay-preemptions-from"
+        conflicts_with = "replay_preemptions_from"
     )]
     pub replay_schedule_from: Option<PathBuf>,
 
@@ -142,13 +142,13 @@ pub struct Config {
     #[clap(long,
            short = 's',
            value_name = "index[,path]",
-           parse(try_from_str = parse_index_with_path))]
+           value_parser = parse_index_with_path)]
     pub stacktrace_event: Vec<(u64, Option<PathBuf>)>,
 
     /// Internal feature used to signal the guest with SIGINT at every `--stacktrace-event`, this is
     /// in-lieu of using hermit's internal stacktrace printing facility, to instead have an external
     /// debugger handle it.  Accepts either signal names or numbers.
-    #[clap(long, value_name = "signame", parse(try_from_str))]
+    #[clap(long, value_name = "signame")]
     pub stacktrace_signal: Option<SigWrapper>,
 
     /// [DEPRECATED] Print a stacktrace each time the program is preempted.  Only makes sense in `--chaos` mode
@@ -209,7 +209,7 @@ pub struct Config {
     #[clap(long,
                 value_name = "uint64|'disabled'",
                 default_value = "200000000",
-                parse(try_from_str = parse_preemption_timeout))]
+                value_parser = parse_preemption_timeout)]
     pub preemption_timeout: MaybePreemptionTimeout,
 
     /// Shut down immediately upon SIGINT, rather than letting the guest handle it.
@@ -293,13 +293,13 @@ pub struct Config {
     /// Configure memory available for the container.  Takes a number of bytes, or shorthand (e.g.
     /// "1GB"). Right now this doesn't enforce an upper bound, but does affect the amount of memory
     /// reported to the guest.
-    #[clap(long, default_value = "1GB", parse(try_from_str = try_parse_memory), value_name = "bytesize")]
+    #[clap(long, default_value = "1GB", value_parser = try_parse_memory, value_name = "bytesize")]
     pub memory: u64,
 
     /// Configure extra interrupt points based on thread id and rcb counter. Detcore will raise a precise
     /// timer for this RCB whenever it detects that current current thread timeslice intercects any of the
     /// interrupt points specified
-    #[clap(long, value_name = "tid:rcbs", parse(try_from_str = try_parse_numbers_with_colon))]
+    #[clap(long, value_name = "tid:rcbs", value_parser = try_parse_numbers_with_colon)]
     pub interrupt_at: Vec<(DetTid, u64)>,
 }
 
@@ -744,7 +744,7 @@ impl Config {
             OsString::from("CMD"), // Silly/unused.
             OsString::from(format!("--epoch={}", DEFAULT_EPOCH_STR)),
         ];
-        Config::from_iter(args.iter())
+        Config::parse_from(args.iter())
     }
 
     /// Returns effective "rng-seed" parameter taking in account "seed"
@@ -771,6 +771,6 @@ impl Config {
 impl Default for Config {
     fn default() -> Self {
         let v: Vec<String> = vec![];
-        Config::from_iter(v.iter())
+        Config::parse_from(v.iter())
     }
 }

detcore/Cargo.toml

@@ -28,7 +28,7 @@ anyhow = "1.0.98"
 async-trait = "0.1.86"
 bitflags = { version = "2.9", features = ["serde"], default-features = false }
 chrono = { version = "0.4.41", features = ["clock", "serde", "std"], default-features = false }
-clap = { version = "3.2.25", features = ["derive", "env", "regex", "unicode", "wrap_help"] }
+clap = { version = "4.5.42", features = ["derive", "env", "string", "unicode", "wrap_help"] }
 detcore-model = { version = "0.0.0", path = "../detcore-model" }
 digest = { version = "0.0.0", path = "../common/digest" }
 futures = { version = "0.3.31", features = ["async-await", "compat"] }

detcore/src/logdiff.rs

@@ -107,7 +107,7 @@ impl LogDiffOpts {
 }
 
 /// Indicates which DETLOG entries to be used for log-diff comparison
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Debug, Clone, PartialEq, Eq)]
 pub enum DetLogFilter {
     ///the start of syscall will be used for logdiff
     Syscall,
@@ -138,7 +138,7 @@ impl FromStr for DetLogFilter {
 impl Default for LogDiffOpts {
     fn default() -> Self {
         let v: Vec<String> = vec![];
-        LogDiffOpts::from_iter(v.iter())
+        LogDiffOpts::parse_from(v.iter())
     }
 }
 

hermit-cli/Cargo.toml

@@ -10,7 +10,7 @@ license = "BSD-3-Clause"
 [dependencies]
 anyhow = "1.0.98"
 bincode = "1.3.3"
-clap = { version = "3.2.25", features = ["derive", "env", "regex", "unicode", "wrap_help"] }
+clap = { version = "4.5.42", features = ["derive", "env", "string", "unicode", "wrap_help"] }
 colored = "2.1.0"
 detcore = { version = "0.0.0", path = "../detcore" }
 diff = "0.1.13"

hermit-cli/src/bin/hermit/analyze/rundata.rs

@@ -353,7 +353,7 @@ impl RunData {
         for arg in &aopts.run_args {
             run_cmd.push(arg.to_string());
         }
-        RunOpts::from_iter(run_cmd.iter())
+        RunOpts::parse_from(run_cmd.iter())
     }
 
     /// Extract the (initial) RunOpts for target/run1 that are implied by all of hermit analyze's arguments.

hermit-cli/src/bin/hermit/analyze/types.rs

@@ -59,13 +59,7 @@ pub struct AnalyzeOpts {
     pub target_exit_code: ExitStatusConstraint,
 
     /// What level of logging to enable for the guest runs.
-    #[clap(
-        short,
-        long,
-        value_name = "LEVEL",
-        env = "HERMIT_LOG",
-        possible_values = &["off", "error", "warn", "info", "debug", "trace"]
-    )]
+    #[clap(short, long, value_name = "LEVEL", env = "HERMIT_LOG")]
     pub guest_log: Option<LevelFilter>,
 
     /// Insist on perfect determinism before proceeding with the analysis.
@@ -85,9 +79,9 @@ pub struct AnalyzeOpts {
     /// the subsequent binary search.
     #[clap(
         long,
-        conflicts_with = "run2-seed",
-        conflicts_with = "run2-preemptions",
-        conflicts_with = "run2-schedule"
+        conflicts_with = "run2_seed",
+        conflicts_with = "run2_preemptions",
+        conflicts_with = "run2_schedule"
     )]
     pub minimize: bool,
 
@@ -101,26 +95,26 @@ pub struct AnalyzeOpts {
     /// It is an error if this execution does not meet the indicated target criteria.
     #[clap(
         long,
-        conflicts_with = "run1-preemptions",
-        conflicts_with = "run1-schedule",
+        conflicts_with = "run1_preemptions",
+        conflicts_with = "run1_schedule",
         value_name = "NUM"
     )]
     pub run1_seed: Option<u64>,
 
     /// Load target execution from hermit run --record-preemptions-to.
     #[clap(
         long,
-        conflicts_with = "run1-seed",
-        conflicts_with = "run1-schedule",
+        conflicts_with = "run1_seed",
+        conflicts_with = "run1_schedule",
         value_name = "PATH"
     )]
     pub run1_preemptions: Option<PathBuf>,
 
     /// Load target execution from hermit run --record-schedule-to.
     #[clap(
         long,
-        conflicts_with = "run1-seed",
-        conflicts_with = "run1-preemptions",
+        conflicts_with = "run1_seed",
+        conflicts_with = "run1_preemptions",
         value_name = "PATH"
     )]
     pub run1_schedule: Option<PathBuf>,
@@ -129,26 +123,26 @@ pub struct AnalyzeOpts {
     /// does NOT meet the target criteria.
     #[clap(
         long,
-        conflicts_with = "run2-preemptions",
-        conflicts_with = "run2-schedule",
+        conflicts_with = "run2_preemptions",
+        conflicts_with = "run2_schedule",
         value_name = "NUM"
     )]
     pub run2_seed: Option<u64>,
 
     /// Load baseline execution from hermit run --record-preemptions-to.
     #[clap(
         long,
-        conflicts_with = "run2-seed",
-        conflicts_with = "run2-schedule",
+        conflicts_with = "run2_seed",
+        conflicts_with = "run2_schedule",
         value_name = "PATH"
     )]
     pub run2_preemptions: Option<PathBuf>,
 
     /// Load baseline execution from hermit run --record-schedule-to.
     #[clap(
         long,
-        conflicts_with = "run2-seed",
-        conflicts_with = "run2-preemptions",
+        conflicts_with = "run2_seed",
+        conflicts_with = "run2_preemptions",
         value_name = "PATH"
     )]
     pub run2_schedule: Option<PathBuf>,

hermit-cli/src/bin/hermit/global_opts.rs

@@ -37,17 +37,11 @@ use super::tracing::init_stderr_tracing;
 #[derive(Debug, Parser, Clone)]
 pub struct GlobalOpts {
     /// The verbosity level of log output.
-    #[clap(
-        short,
-        long,
-        value_name = "LEVEL",
-        env = "HERMIT_LOG",
-        possible_values = &["off", "error", "warn", "info", "debug", "trace"]
-    )]
+    #[clap(short, long, value_name = "LEVEL", env = "HERMIT_LOG")]
     pub log: Option<LevelFilter>,
 
     /// Log to a file instead of the terminal.
-    #[clap(long, value_name = "FILE", env = "HERMIT_LOG_FILE", parse(from_os_str))]
+    #[clap(long, value_name = "FILE", env = "HERMIT_LOG_FILE")]
     pub log_file: Option<PathBuf>,
 }
 

hermit-cli/src/bin/hermit/main.rs

@@ -27,7 +27,6 @@ mod tracing;
 mod verify;
 mod version;
 
-use clap::AppSettings;
 use clap::Parser;
 use colored::*;
 use hermit::Error;
@@ -45,7 +44,6 @@ use self::version::Version;
 #[clap(
     name = "hermit",
     version = Version::get(),
-    global_settings(&[AppSettings::ColoredHelp]),
 )]
 struct Args {
     #[clap(flatten)]
@@ -58,15 +56,15 @@ struct Args {
 #[derive(Debug, Parser)]
 enum Subcommand {
     /// Run a program sandboxed and fully deterministically (unless external networking is allowed).
-    #[clap(name = "run", setting = AppSettings::TrailingVarArg)]
+    #[clap(name = "run", trailing_var_arg = true)]
     Run(Box<RunOpts>),
 
     /// Record the execution of a program (EXPERIMENTAL).
-    #[clap(name = "record", setting = AppSettings::TrailingVarArg)]
+    #[clap(name = "record", trailing_var_arg = true)]
     Record(RecordOpts),
 
     /// Replay the execution of a program.
-    #[clap(name = "replay", setting = AppSettings::TrailingVarArg)]
+    #[clap(name = "replay", trailing_var_arg = true)]
     Replay(ReplayOpts),
 
     /// Take the difference of two (run/record) logs written to files.
@@ -93,7 +91,7 @@ fn main() {
     let Args {
         global,
         mut command,
-    } = Args::from_args();
+    } = Args::parse();
 
     command
         .main(&global)

hermit-cli/src/bin/hermit/record_start.rs

@@ -51,11 +51,7 @@ pub struct StartOpts {
     /// recording was successful with gdbserver enabled.
     ///
     /// The recording is deleted if the replay was successful.
-    #[clap(
-        long = "verify-with-gdbex",
-        value_delimiter = ';',
-        use_delimiter = true
-    )]
+    #[clap(long = "verify-with-gdbex", value_delimiter = ';')]
     gdbex: Vec<String>,
 }
 impl StartOpts {