chore(tvix): upgrade to clap 4.0 r/5441

In //tvix/eval:

* criterion bumped to 4.0, which at least depends on clap 3.x instead
  of 2.x, which is less incompatible

In //tvix/cli:

* no changes required

In //tvix/nix_cli:

* some minor changes for compatibility with clap 4.0, no functionality
  changes

Change-Id: If793f64b59fcaa2402d3d483ddbab4092f32df03
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7588
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI

1 files changed, 4 insertions, 4 deletions

diff --git a/tvix/nix_cli/src/bin/nix-store.rs b/tvix/nix_cli/src/bin/nix-store.rs
index 8d008a414dc4..c6f7d00a4df8 100644
--- a/tvix/nix_cli/src/bin/nix-store.rs
+++ b/tvix/nix_cli/src/bin/nix-store.rs
@@ -2,12 +2,12 @@ fn main() {
     main_args(std::env::args().collect()).unwrap_or_else(|e| e.exit());
 }
 
-pub fn main_args(args: Vec<String>) -> clap::Result<NixResult> {
-    let matches = clap::App::new("nix-store")
-        .subcommand(clap::App::new("--add").arg(clap::Arg::new("FILE").required(true).index(1)))
+pub fn main_args(args: Vec<String>) -> clap::error::Result<NixResult> {
+    let matches = clap::Command::new("nix-store")
+        .subcommand(clap::Command::new("--add").arg(clap::Arg::new("FILE").required(true).index(1)))
         .try_get_matches_from(args.iter())?;
     if let Some(add) = matches.subcommand_matches("--add") {
-        let file = add.value_of("FILE").expect("--add needs a file");
+        let file = add.get_one::<String>("FILE").expect("--add needs a file");
         let file_contents =
             std::fs::read_to_string(file).expect(&format!("file {} does not exist", file));
         Ok(NixResult::FileAddedToStore {