From b681f234a300511c97d23b2fbd8300504c2abb04 Mon Sep 17 00:00:00 2001 From: Jonas Platte Date: Mon, 3 Jul 2023 17:47:06 +0200 Subject: [PATCH] Upgrade criterion, pprof --- Cargo.lock | 87 +++++++++---------------------------------- benchmarks/Cargo.toml | 4 +- 2 files changed, 19 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e2e6085c6..827b5b3c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -424,17 +424,6 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1181e1e0d1fce796a03db1ae795d67167da795f9cf4a39c37589e85ef57f26d3" -[[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 = "autocfg" version = "1.1.0" @@ -843,18 +832,6 @@ dependencies = [ "inout", ] -[[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 1.9.3", - "textwrap", -] - [[package]] name = "clap" version = "4.3.8" @@ -875,7 +852,7 @@ dependencies = [ "anstream", "anstyle", "bitflags 1.3.2", - "clap_lex 0.5.0", + "clap_lex", "once_cell", "strsim", ] @@ -892,15 +869,6 @@ dependencies = [ "syn 2.0.22", ] -[[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.5.0" @@ -1033,20 +1001,20 @@ 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", "futures", + "is-terminal", "itertools", - "lazy_static", "num-traits", + "once_cell", "oorandom", "plotters", "rayon", @@ -1421,7 +1389,7 @@ name = "example-emoji-verification" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.3.8", + "clap", "futures-util", "matrix-sdk", "tokio", @@ -1492,7 +1460,7 @@ name = "example-timeline" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.3.8", + "clap", "futures-util", "matrix-sdk", "matrix-sdk-ui", @@ -1930,15 +1898,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.2.6" @@ -3480,12 +3439,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" -[[package]] -name = "os_str_bytes" -version = "6.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d5d9eb14b174ee9aa2ef96dc2b94637a2d4b6e7cb873c7e171f0c20c6cf3eac" - [[package]] name = "overload" version = "0.1.1" @@ -3772,9 +3725,9 @@ dependencies = [ [[package]] name = "pprof" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "196ded5d4be535690899a4631cc9f18cdc41b7ebf24a79400f46f48e49a11059" +checksum = "6b90f8560ad8bd57b207b8293bc5226e48e89039a6e590c12a297d91b84c7e60" dependencies = [ "backtrace", "cfg-if", @@ -4806,9 +4759,9 @@ checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" [[package]] name = "symbolic-common" -version = "10.2.1" +version = "12.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b55cdc318ede251d0957f07afe5fed912119b8c1bc5a7804151826db999e737" +checksum = "38f7afd8bcd36190409e6b71d89928f7f09d918a7aa3460d847bc49a538d672e" dependencies = [ "debugid", "memmap2", @@ -4818,9 +4771,9 @@ dependencies = [ [[package]] name = "symbolic-demangle" -version = "10.2.1" +version = "12.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79be897be8a483a81fff6a3a4e195b4ac838ef73ca42d348b3f722da9902e489" +checksum = "ec64922563a36e3fe686b6d99f06f25dacad2a202ac7502ed642930a188fb20a" dependencies = [ "cpp_demangle", "rustc-demangle", @@ -4880,12 +4833,6 @@ dependencies = [ "utf-8", ] -[[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" @@ -5379,7 +5326,7 @@ source = "git+https://github.com/mozilla/uniffi-rs?rev=a123d11c7aede132c4210a69c dependencies = [ "anyhow", "camino", - "clap 4.3.8", + "clap", "uniffi_bindgen", "uniffi_build", "uniffi_core", @@ -5402,7 +5349,7 @@ dependencies = [ "askama", "camino", "cargo_metadata", - "clap 4.3.8", + "clap", "fs-err", "glob", "goblin", @@ -6063,7 +6010,7 @@ name = "xtask" version = "0.1.0" dependencies = [ "camino", - "clap 4.3.8", + "clap", "fs_extra", "serde", "serde_json", diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index 055d02a3f..f15758f0d 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -8,7 +8,7 @@ version = "1.0.0" publish = false [dependencies] -criterion = { version = "0.4.0", features = ["async", "async_tokio", "html_reports"] } +criterion = { version = "0.5.1", features = ["async", "async_tokio", "html_reports"] } matrix-sdk-base = { path = "../crates/matrix-sdk-base" } matrix-sdk-crypto = { path = "../crates/matrix-sdk-crypto", version = "0.6.0"} matrix-sdk-sqlite = { path = "../crates/matrix-sdk-sqlite", version = "0.1.0", default-features = false, features = ["crypto-store"] } @@ -20,7 +20,7 @@ tempfile = "3.3.0" tokio = { version = "1.24.2", default-features = false, features = ["rt-multi-thread"] } [target.'cfg(target_os = "linux")'.dependencies] -pprof = { version = "0.11.0", features = ["flamegraph", "criterion"] } +pprof = { version = "0.12.0", features = ["flamegraph", "criterion"] } [[bench]] name = "crypto_bench"