mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore(tvix): upgrade to clap 4.0

Browse source 
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
This commit is contained in:
Vincent Ambo 2022-12-16 14:54:22 +03:00 • committed by tazjin
parent d9e2bec953
commit 257c67f204
7 changed files with 482 additions and 449 deletions
Download patch file Download diff file Expand all files Collapse all files

3
tvix/nix_cli/Cargo.toml
View file

@ -6,7 +6,8 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
[dependencies.clap]
version = "3.0.5"
version = "4.0"
[dependencies.tempfile]
version = "3.2.0"

8
tvix/nix_cli/src/bin/nix-store.rs
View file

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