From 01a3c87a3ab1b7df6045f5a32746c340b7e4ad3a Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Sat, 9 Dec 2023 19:26:40 +0200 Subject: chore(tvix): bump criterion to 0.5 Change-Id: I28904ca23437b4bb745c0eb1f4eb9ae33e09eb5a Reviewed-on: https://cl.tvl.fyi/c/depot/+/10244 Reviewed-by: grfn Autosubmit: flokli Tested-by: BuildkiteCI --- tvix/Cargo.lock | 49 +++-------------- tvix/Cargo.nix | 132 ++++++--------------------------------------- tvix/eval/Cargo.toml | 2 +- tvix/nix-compat/Cargo.toml | 2 +- 4 files changed, 26 insertions(+), 159 deletions(-) diff --git a/tvix/Cargo.lock b/tvix/Cargo.lock index e1838f331760..d7f4bba1a5af 100644 --- a/tvix/Cargo.lock +++ b/tvix/Cargo.lock @@ -382,18 +382,6 @@ dependencies = [ "half", ] -[[package]] -name = "clap" -version = "3.2.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123" -dependencies = [ - "bitflags 1.3.2", - "clap_lex 0.2.4", - "indexmap", - "textwrap", -] - [[package]] name = "clap" version = "4.2.7" @@ -414,7 +402,7 @@ dependencies = [ "anstream", "anstyle", "bitflags 1.3.2", - "clap_lex 0.4.1", + "clap_lex", "strsim", ] @@ -430,15 +418,6 @@ dependencies = [ "syn 2.0.39", ] -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - [[package]] name = "clap_lex" version = "0.4.1" @@ -539,19 +518,19 @@ dependencies = [ [[package]] name = "criterion" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ "anes", - "atty", "cast", "ciborium", - "clap 3.2.25", + "clap", "criterion-plot", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -1633,12 +1612,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" -[[package]] -name = "os_str_bytes" -version = "6.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ceedf44fb00f2d1984b0bc98102627ce622e083e49a5bacdb3e514fa4238e267" - [[package]] name = "overload" version = "0.1.1" @@ -2718,12 +2691,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "288cb548dbe72b652243ea797201f3d481a0609a967980fcc5b2315ea811560a" -[[package]] -name = "textwrap" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d" - [[package]] name = "thiserror" version = "1.0.40" @@ -3120,7 +3087,7 @@ name = "tvix-cli" version = "0.1.0" dependencies = [ "bytes", - "clap 4.2.7", + "clap", "dirs", "nix-compat", "rustyline", @@ -3210,7 +3177,7 @@ dependencies = [ "async-stream", "blake3", "bytes", - "clap 4.2.7", + "clap", "count-write", "data-encoding", "fuse-backend-rs", diff --git a/tvix/Cargo.nix b/tvix/Cargo.nix index b6d17d21651c..9553d0c88f0b 100644 --- a/tvix/Cargo.nix +++ b/tvix/Cargo.nix @@ -1164,59 +1164,7 @@ rec { "std" = [ "alloc" ]; }; }; - "clap 3.2.25" = rec { - crateName = "clap"; - version = "3.2.25"; - edition = "2021"; - crateBin = [ ]; - sha256 = "08vi402vfqmfj9f07c4gl6082qxgf4c9x98pbndcnwbgaszq38af"; - dependencies = [ - { - name = "bitflags"; - packageId = "bitflags 1.3.2"; - } - { - name = "clap_lex"; - packageId = "clap_lex 0.2.4"; - } - { - name = "indexmap"; - packageId = "indexmap"; - } - { - name = "textwrap"; - packageId = "textwrap"; - usesDefaultFeatures = false; - } - ]; - features = { - "atty" = [ "dep:atty" ]; - "backtrace" = [ "dep:backtrace" ]; - "cargo" = [ "once_cell" ]; - "clap_derive" = [ "dep:clap_derive" ]; - "color" = [ "atty" "termcolor" ]; - "debug" = [ "clap_derive/debug" "backtrace" ]; - "default" = [ "std" "color" "suggestions" ]; - "deprecated" = [ "clap_derive/deprecated" ]; - "derive" = [ "clap_derive" "once_cell" ]; - "once_cell" = [ "dep:once_cell" ]; - "regex" = [ "dep:regex" ]; - "std" = [ "indexmap/std" ]; - "strsim" = [ "dep:strsim" ]; - "suggestions" = [ "strsim" ]; - "termcolor" = [ "dep:termcolor" ]; - "terminal_size" = [ "dep:terminal_size" ]; - "unicase" = [ "dep:unicase" ]; - "unicode" = [ "textwrap/unicode-width" "unicase" ]; - "unstable-doc" = [ "derive" "cargo" "wrap_help" "yaml" "env" "unicode" "regex" "unstable-replace" "unstable-grouped" ]; - "unstable-v4" = [ "clap_derive/unstable-v4" "deprecated" ]; - "wrap_help" = [ "terminal_size" "textwrap/terminal_size" ]; - "yaml" = [ "yaml-rust" ]; - "yaml-rust" = [ "dep:yaml-rust" ]; - }; - resolvedDefaultFeatures = [ "std" ]; - }; - "clap 4.2.7" = rec { + "clap" = rec { crateName = "clap"; version = "4.2.7"; edition = "2021"; @@ -1282,7 +1230,7 @@ rec { } { name = "clap_lex"; - packageId = "clap_lex 0.4.1"; + packageId = "clap_lex"; } { name = "strsim"; @@ -1336,22 +1284,7 @@ rec { }; resolvedDefaultFeatures = [ "default" ]; }; - "clap_lex 0.2.4" = rec { - crateName = "clap_lex"; - version = "0.2.4"; - edition = "2021"; - sha256 = "1ib1a9v55ybnaws11l63az0jgz5xiy24jkdgsmyl7grcm3sz4l18"; - dependencies = [ - { - name = "os_str_bytes"; - packageId = "os_str_bytes"; - usesDefaultFeatures = false; - features = [ "raw_os_str" ]; - } - ]; - - }; - "clap_lex 0.4.1" = rec { + "clap_lex" = rec { crateName = "clap_lex"; version = "0.4.1"; edition = "2021"; @@ -1570,9 +1503,9 @@ rec { }; "criterion" = rec { crateName = "criterion"; - version = "0.4.0"; + version = "0.5.1"; edition = "2018"; - sha256 = "1jsl4r0yc3fpkyjbi8aa1jrm69apqq9rxwnjnd9brqmaq44nxiz7"; + sha256 = "0bv9ipygam3z8kk6k771gh9zi0j0lb9ir0xi1pc075ljg80jvcgj"; authors = [ "Jorge Aparicio " "Brook Heisler " @@ -1582,10 +1515,6 @@ rec { name = "anes"; packageId = "anes"; } - { - name = "atty"; - packageId = "atty"; - } { name = "cast"; packageId = "cast"; @@ -1596,7 +1525,7 @@ rec { } { name = "clap"; - packageId = "clap 3.2.25"; + packageId = "clap"; usesDefaultFeatures = false; features = [ "std" ]; } @@ -1605,12 +1534,12 @@ rec { packageId = "criterion-plot"; } { - name = "itertools"; - packageId = "itertools"; + name = "is-terminal"; + packageId = "is-terminal"; } { - name = "lazy_static"; - packageId = "lazy_static"; + name = "itertools"; + packageId = "itertools"; } { name = "num-traits"; @@ -1618,6 +1547,10 @@ rec { usesDefaultFeatures = false; features = [ "std" ]; } + { + name = "once_cell"; + packageId = "once_cell"; + } { name = "oorandom"; packageId = "oorandom"; @@ -4910,22 +4843,6 @@ rec { ]; }; - "os_str_bytes" = rec { - crateName = "os_str_bytes"; - version = "6.5.0"; - edition = "2021"; - sha256 = "0rz2711gl575ng6vm9a97q42wqnf4wk1165wn221jb8gn17z9vff"; - authors = [ - "dylni" - ]; - features = { - "default" = [ "memchr" "raw_os_str" ]; - "memchr" = [ "dep:memchr" ]; - "print_bytes" = [ "dep:print_bytes" ]; - "uniquote" = [ "dep:uniquote" ]; - }; - resolvedDefaultFeatures = [ "raw_os_str" ]; - }; "overload" = rec { crateName = "overload"; version = "0.1.1"; @@ -8147,23 +8064,6 @@ rec { "serde" = [ "dep:serde" ]; }; }; - "textwrap" = rec { - crateName = "textwrap"; - version = "0.16.0"; - edition = "2021"; - sha256 = "0gbwkjf15l6p3x2rkr75fa4cpcs1ly4c8pmlfx5bl6zybcm24ai2"; - authors = [ - "Martin Geisler " - ]; - features = { - "default" = [ "unicode-linebreak" "unicode-width" "smawk" ]; - "hyphenation" = [ "dep:hyphenation" ]; - "smawk" = [ "dep:smawk" ]; - "terminal_size" = [ "dep:terminal_size" ]; - "unicode-linebreak" = [ "dep:unicode-linebreak" ]; - "unicode-width" = [ "dep:unicode-width" ]; - }; - }; "thiserror" = rec { crateName = "thiserror"; version = "1.0.40"; @@ -9603,7 +9503,7 @@ rec { } { name = "clap"; - packageId = "clap 4.2.7"; + packageId = "clap"; features = [ "derive" "env" ]; } { @@ -9954,7 +9854,7 @@ rec { } { name = "clap"; - packageId = "clap 4.2.7"; + packageId = "clap"; features = [ "derive" "env" ]; } { diff --git a/tvix/eval/Cargo.toml b/tvix/eval/Cargo.toml index 466d05d691ec..ae874a4507c1 100644 --- a/tvix/eval/Cargo.toml +++ b/tvix/eval/Cargo.toml @@ -32,7 +32,7 @@ toml = "0.6.0" xml-rs = "0.8.4" [dev-dependencies] -criterion = "0.4" +criterion = "0.5" pretty_assertions = "1.2.1" itertools = "0.10.3" tempfile = "3.3.0" diff --git a/tvix/nix-compat/Cargo.toml b/tvix/nix-compat/Cargo.toml index 115c1b739764..cec5b7ac977e 100644 --- a/tvix/nix-compat/Cargo.toml +++ b/tvix/nix-compat/Cargo.toml @@ -27,7 +27,7 @@ futures = { version = "0.3.28", default-features = false, features = ["executor" lazy_static = "1.4.0" serde_json = "1.0" test-case = "2.2.2" -criterion = { version = "0.4", features = ["html_reports"] } +criterion = { version = "0.5", features = ["html_reports"] } hex-literal = "0.4.1" pretty_assertions = "1.4.0" zstd = "^0.9.0" -- cgit 1.4.1