From b4216ec634b6685e8d3c855c94db4c79183cae6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Sun, 27 Aug 2023 18:13:32 +0200 Subject: [PATCH] get rid of old criterion --- Cargo.lock | 172 ++++++++++++++---------------------- common/Cargo.toml | 2 +- network/Cargo.toml | 2 +- network/protocol/Cargo.toml | 2 +- voxygen/Cargo.toml | 2 +- world/Cargo.toml | 2 +- 6 files changed, 69 insertions(+), 113 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 73ba304f14..7d553750ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -144,6 +144,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + [[package]] name = "anstream" version = "0.5.0" @@ -379,17 +385,6 @@ dependencies = [ "windows-sys 0.48.0", ] -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi 0.1.19", - "libc", - "winapi", -] - [[package]] name = "auth-common" version = "0.1.0" @@ -658,15 +653,6 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" -[[package]] -name = "cast" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c24dab4283a142afa2fdca129b80ad2c6284e073930f964c3a1293c225ee39a" -dependencies = [ - "rustc_version 0.4.0", -] - [[package]] name = "cast" version = "0.3.0" @@ -773,6 +759,33 @@ dependencies = [ "stacker", ] +[[package]] +name = "ciborium" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "effd91f6c78e5a4ace8a5d3c0b6bfaec9e2baaef55f3efc00e45fb2e477ee926" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdf919175532b369853f5d5e20b26b43112613fd6fe7aee757e35f7a44642656" + +[[package]] +name = "ciborium-ll" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "defaa24ecc093c77630e6c15e17c51f5e187bf35ee514f4e2d67baaa96dae22b" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "clang-sys" version = "1.6.1" @@ -784,17 +797,6 @@ dependencies = [ "libloading 0.7.4", ] -[[package]] -name = "clap" -version = "2.34.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" -dependencies = [ - "bitflags 1.3.2", - "textwrap", - "unicode-width", -] - [[package]] name = "clap" version = "4.4.0" @@ -1239,25 +1241,24 @@ dependencies = [ [[package]] name = "criterion" -version = "0.3.4" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" +checksum = "f2b12d017a929603d80db1831cd3a24082f8137ce19c69e6447f54f5fc8d692f" dependencies = [ - "atty", - "cast 0.2.7", - "clap 2.34.0", + "anes", + "cast", + "ciborium", + "clap", "criterion-plot", - "csv", "futures", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", - "plotters", "rayon", "regex", "serde", - "serde_cbor", "serde_derive", "serde_json", "tinytemplate", @@ -1267,11 +1268,11 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.4.5" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" dependencies = [ - "cast 0.3.0", + "cast", "itertools", ] @@ -2735,15 +2736,6 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - [[package]] name = "hermit-abi" version = "0.3.2" @@ -3080,11 +3072,22 @@ version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", "windows-sys 0.48.0", ] +[[package]] +name = "is-terminal" +version = "0.4.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" +dependencies = [ + "hermit-abi", + "rustix 0.38.9", + "windows-sys 0.48.0", +] + [[package]] name = "itertools" version = "0.10.5" @@ -4011,7 +4014,7 @@ version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi 0.3.2", + "hermit-abi", "libc", ] @@ -4481,34 +4484,6 @@ version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" -[[package]] -name = "plotters" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" -dependencies = [ - "num-traits", - "plotters-backend", - "plotters-svg", - "wasm-bindgen", - "web-sys", -] - -[[package]] -name = "plotters-backend" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" - -[[package]] -name = "plotters-svg" -version = "0.3.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" -dependencies = [ - "plotters-backend", -] - [[package]] name = "png" version = "0.17.10" @@ -5585,16 +5560,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "serde_cbor" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" -dependencies = [ - "half", - "serde", -] - [[package]] name = "serde_derive" version = "1.0.188" @@ -6201,15 +6166,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - [[package]] name = "thiserror" version = "1.0.47" @@ -6854,7 +6810,7 @@ dependencies = [ "async-channel", "authc", "byteorder", - "clap 4.4.0", + "clap", "hashbrown 0.13.2", "image", "num 0.4.1", @@ -6884,7 +6840,7 @@ dependencies = [ name = "veloren-client-i18n" version = "0.13.0" dependencies = [ - "clap 4.4.0", + "clap", "deunicode", "fluent", "fluent-bundle", @@ -6908,7 +6864,7 @@ dependencies = [ "cfg-if 1.0.0", "chrono", "chrono-tz", - "clap 4.4.0", + "clap", "criterion", "crossbeam-channel", "crossbeam-utils 0.8.16", @@ -7076,7 +7032,7 @@ dependencies = [ "bincode", "bitflags 2.4.0", "bytes", - "clap 4.4.0", + "clap", "criterion", "crossbeam-channel", "futures-core", @@ -7246,7 +7202,7 @@ name = "veloren-server-cli" version = "0.15.0" dependencies = [ "cansi", - "clap 4.4.0", + "clap", "crossterm 0.26.1", "lazy_static", "mimalloc", @@ -7278,7 +7234,7 @@ dependencies = [ "bytemuck", "chrono", "chumsky", - "clap 4.4.0", + "clap", "cmake", "conrod_core", "conrod_winit", @@ -7389,7 +7345,7 @@ dependencies = [ "arr_macro", "bincode", "bitvec", - "clap 4.4.0", + "clap", "criterion", "csv", "deflate", diff --git a/common/Cargo.toml b/common/Cargo.toml index b2a298f2c1..0234bbed2d 100644 --- a/common/Cargo.toml +++ b/common/Cargo.toml @@ -80,7 +80,7 @@ specs = { workspace = true, features = ["serde", "storage-event-control"] } [dev-dependencies] #bench -criterion = "0.3" +criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support"]} rand_chacha = { workspace = true } #test diff --git a/network/Cargo.toml b/network/Cargo.toml index b118860249..17a602363a 100644 --- a/network/Cargo.toml +++ b/network/Cargo.toml @@ -56,7 +56,7 @@ clap = { workspace = true } shellexpand = "3.1.0" serde = { version = "1.0", features = ["derive"] } prometheus-hyper = { workspace = true } -criterion = { version = "0.3.4", features = ["default", "async_tokio"] } +criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support", "async_tokio"]} #quic rcgen = { version = "0.11"} diff --git a/network/protocol/Cargo.toml b/network/protocol/Cargo.toml index 378513742f..de820f2a85 100644 --- a/network/protocol/Cargo.toml +++ b/network/protocol/Cargo.toml @@ -29,7 +29,7 @@ hashbrown = { workspace = true } [dev-dependencies] async-channel = "1.6" tokio = { workspace = true, features = ["macros"] } -criterion = { version = "0.3.4", features = ["default", "async_tokio"] } +criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support", "async_tokio"]} [[bench]] name = "protocols" diff --git a/voxygen/Cargo.toml b/voxygen/Cargo.toml index ec49d56981..af5d3da4d8 100644 --- a/voxygen/Cargo.toml +++ b/voxygen/Cargo.toml @@ -149,7 +149,7 @@ mimalloc = "0.1.29" mumble-link = "0.2.0" [dev-dependencies] -criterion = "0.3" +criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support"]} world = {package = "veloren-world", path = "../world"} rayon = { workspace = true } diff --git a/world/Cargo.toml b/world/Cargo.toml index d7bc42a6f6..6ced989ad6 100644 --- a/world/Cargo.toml +++ b/world/Cargo.toml @@ -55,7 +55,7 @@ clap = { workspace = true, optional = true } [dev-dependencies] common-frontend = { package = "veloren-common-frontend", path = "../common/frontend" } -criterion = "0.3" +criterion = { version = "0.5.1", default-features=false, features=["rayon", "cargo_bench_support"]} csv = "1.1.3" tracing-subscriber = { version = "0.3.7", default-features = false, features = ["fmt", "time", "ansi", "smallvec", "env-filter"] } minifb = "0.24"