From 8118691570948c1fc7e8758c8c11af3fa2e1e4ad Mon Sep 17 00:00:00 2001 From: klensy Date: Thu, 10 Jul 2025 11:44:51 +0300 Subject: [PATCH 1/3] transit all deps to thiserrorv2 except direct dep --- Cargo.lock | 60 ++++++++++++++++++++---------- collector/Cargo.toml | 2 +- collector/src/artifact_stats.rs | 2 +- collector/src/runtime/benchmark.rs | 2 +- site/Cargo.toml | 2 +- 5 files changed, 45 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0ff3d610d..39d1a5112 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -295,16 +295,16 @@ dependencies = [ [[package]] name = "cargo_metadata" -version = "0.18.1" +version = "0.19.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" +checksum = "dd5eb614ed4c27c5d706420e4320fbe3216ab31fa1c33cd8246ac36dae4479ba" dependencies = [ "camino", "cargo-platform", "semver", "serde", "serde_json", - "thiserror", + "thiserror 2.0.12", ] [[package]] @@ -416,7 +416,7 @@ dependencies = [ "tabled", "tar", "tempfile", - "thiserror", + "thiserror 1.0.40", "thousands", "tokio", "walkdir", @@ -744,7 +744,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1398,7 +1398,7 @@ checksum = "e19b23d53f35ce9f56aebc7d1bb4e6ac1e9c0db7ac85c8d1760c04379edced37" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -1867,11 +1867,12 @@ dependencies = [ [[package]] name = "pest" -version = "2.5.6" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cbd939b234e95d72bc393d51788aec68aeeb5d51e748ca08ff3aad58cb722f7" +checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" dependencies = [ - "thiserror", + "memchr", + "thiserror 2.0.12", "ucd-trie", ] @@ -2036,16 +2037,16 @@ dependencies = [ [[package]] name = "prometheus" -version = "0.13.3" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c" +checksum = "3ca5326d8d0b950a9acd87e6a3f94745394f62e4dae1b1ee22b2bc0c394af43a" dependencies = [ "cfg-if", "fnv", "lazy_static", "memchr", "parking_lot", - "thiserror", + "thiserror 2.0.12", ] [[package]] @@ -2139,7 +2140,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.8", "libredox", - "thiserror", + "thiserror 1.0.40", ] [[package]] @@ -2311,7 +2312,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2416,11 +2417,12 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.109" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0652c533506ad7a2e353cce269330d6afd8bdfb6d75e0ace5b35aacbd7b9e9" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", + "memchr", "ryu", "serde", ] @@ -2760,7 +2762,7 @@ dependencies = [ "fastrand", "once_cell", "rustix", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -2794,7 +2796,16 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.40", +] + +[[package]] +name = "thiserror" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" +dependencies = [ + "thiserror-impl 2.0.12", ] [[package]] @@ -2808,6 +2819,17 @@ dependencies = [ "syn 2.0.87", ] +[[package]] +name = "thiserror-impl" +version = "2.0.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", +] + [[package]] name = "thousands" version = "0.2.0" @@ -3320,7 +3342,7 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.48.0", + "windows-sys 0.59.0", ] [[package]] diff --git a/collector/Cargo.toml b/collector/Cargo.toml index 75134a8a2..b10ad44bf 100644 --- a/collector/Cargo.toml +++ b/collector/Cargo.toml @@ -29,7 +29,7 @@ snap = "1" walkdir = "2" flate2 = { version = "1.0.22", features = ["rust_backend"] } rayon = "1" -cargo_metadata = "0.18" +cargo_metadata = "0.19" thousands = "0.2.0" rustc-demangle = { version = "0.1", features = ["std"] } similar = "2.2" diff --git a/collector/src/artifact_stats.rs b/collector/src/artifact_stats.rs index 9688e8109..cd2b47789 100644 --- a/collector/src/artifact_stats.rs +++ b/collector/src/artifact_stats.rs @@ -225,7 +225,7 @@ pub fn compile_and_get_stats( .. } = artifact; if let Some(executable) = executable { - if target.kind.iter().any(|kind| kind == "bin") { + if target.is_bin() { let stats = ArtifactStats::from_dynamic_object(executable.as_std_path()) .with_context(|| format!("Cannot parse executable stats from {executable}"))?; archives.push(ArtifactWithStats { diff --git a/collector/src/runtime/benchmark.rs b/collector/src/runtime/benchmark.rs index 7fc83a8d7..b525010a6 100644 --- a/collector/src/runtime/benchmark.rs +++ b/collector/src/runtime/benchmark.rs @@ -276,7 +276,7 @@ fn parse_benchmark_group( if let Some(ref executable) = artifact.executable { // Found a binary compiled by a runtime benchmark crate. // Execute it so that we find all the benchmarks it contains. - if artifact.target.kind.iter().any(|k| k == "bin") { + if artifact.target.is_bin() { if group.is_some() { return Err(anyhow::anyhow!( "Runtime benchmark group `{group_name}` has produced multiple binaries" diff --git a/site/Cargo.toml b/site/Cargo.toml index 1304d39a6..4b813e6ca 100644 --- a/site/Cargo.toml +++ b/site/Cargo.toml @@ -42,7 +42,7 @@ analyzeme = "12.0.0" inferno = { version = "0.11", default-features = false } mime = "0.3" # prometheus currently uses plain text, so disable protobuf -prometheus = { version = "0.13", default-features = false } +prometheus = { version = "0.14", default-features = false } uuid = { version = "1.3.0", features = ["v4"] } tera = { version = "1.19", default-features = false } rust-embed = { version = "6.6.0", features = [ From d5ac106ef9f7edbcb00b866da281d1d2ff42579c Mon Sep 17 00:00:00 2001 From: klensy Date: Thu, 10 Jul 2025 11:49:24 +0300 Subject: [PATCH 2/3] bump thiserror direct dep by updating rust-embed drop thiserror1 --- Cargo.lock | 71 ++++++++++++++++++-------------------------- collector/Cargo.toml | 2 +- site/Cargo.toml | 2 +- 3 files changed, 31 insertions(+), 44 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 39d1a5112..946767e08 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -304,7 +304,7 @@ dependencies = [ "semver", "serde", "serde_json", - "thiserror 2.0.12", + "thiserror", ] [[package]] @@ -416,7 +416,7 @@ dependencies = [ "tabled", "tar", "tempfile", - "thiserror 1.0.40", + "thiserror", "thousands", "tokio", "walkdir", @@ -662,22 +662,23 @@ dependencies = [ [[package]] name = "dirs" -version = "4.0.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.7" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" dependencies = [ "libc", + "option-ext", "redox_users", - "winapi", + "windows-sys 0.59.0", ] [[package]] @@ -1782,6 +1783,12 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "option-ext" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" + [[package]] name = "papergrid" version = "0.13.0" @@ -1872,7 +1879,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1db05f56d34358a8b1066f67cbb203ee3e7ed2ba674a6263a1d5ec6db2204323" dependencies = [ "memchr", - "thiserror 2.0.12", + "thiserror", "ucd-trie", ] @@ -2046,7 +2053,7 @@ dependencies = [ "lazy_static", "memchr", "parking_lot", - "thiserror 2.0.12", + "thiserror", ] [[package]] @@ -2134,13 +2141,13 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" +checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b" dependencies = [ "getrandom 0.2.8", "libredox", - "thiserror 1.0.40", + "thiserror", ] [[package]] @@ -2247,9 +2254,9 @@ dependencies = [ [[package]] name = "rust-embed" -version = "6.6.0" +version = "8.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb133b9a38b5543fad3807fb2028ea47c5f2b566f4f5e28a11902f1a358348b6" +checksum = "025908b8682a26ba8d12f6f2d66b987584a4a87bc024abc5bbc12553a8cd178a" dependencies = [ "rust-embed-impl", "rust-embed-utils", @@ -2258,23 +2265,23 @@ dependencies = [ [[package]] name = "rust-embed-impl" -version = "6.5.0" +version = "8.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4e0f0ced47ded9a68374ac145edd65a6c1fa13a96447b873660b2a568a0fd7" +checksum = "6065f1a4392b71819ec1ea1df1120673418bf386f50de1d6f54204d836d4349c" dependencies = [ "proc-macro2", "quote", "rust-embed-utils", "shellexpand", - "syn 1.0.109", + "syn 2.0.87", "walkdir", ] [[package]] name = "rust-embed-utils" -version = "7.5.0" +version = "8.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "512b0ab6853f7e14e3c8754acb43d6f748bb9ced66aa5915a6553ac8213f7731" +checksum = "f6cc0c81648b20b70c491ff8cce00c1c3b223bb8ed2b5d41f0e54c6c4c0a3594" dependencies = [ "globset", "sha2", @@ -2472,9 +2479,9 @@ dependencies = [ [[package]] name = "shellexpand" -version = "2.1.2" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ccc8076840c4da029af4f87e4e8daeb0fca6b87bbb02e10cb60b791450e11e4" +checksum = "8b1fdf65dd6331831494dd616b30351c38e96e45921a27745cf98490458b90bb" dependencies = [ "dirs", ] @@ -2790,33 +2797,13 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "thiserror" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" -dependencies = [ - "thiserror-impl 1.0.40", -] - [[package]] name = "thiserror" version = "2.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708" dependencies = [ - "thiserror-impl 2.0.12", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.40" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.87", + "thiserror-impl", ] [[package]] diff --git a/collector/Cargo.toml b/collector/Cargo.toml index b10ad44bf..8913efbcd 100644 --- a/collector/Cargo.toml +++ b/collector/Cargo.toml @@ -17,7 +17,7 @@ serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } tokio = { workspace = true, features = ["rt", "process"] } -thiserror = "1" +thiserror = "2" tempfile = "3" libc = "0.2" semver = "1.0" diff --git a/site/Cargo.toml b/site/Cargo.toml index 4b813e6ca..336134367 100644 --- a/site/Cargo.toml +++ b/site/Cargo.toml @@ -45,7 +45,7 @@ mime = "0.3" prometheus = { version = "0.14", default-features = false } uuid = { version = "1.3.0", features = ["v4"] } tera = { version = "1.19", default-features = false } -rust-embed = { version = "6.6.0", features = [ +rust-embed = { version = "8.2.0", features = [ "include-exclude", "interpolate-folder-path", ] } From 23a5ef1c9ff4d7c291b0c5fa352bf1489c4a7ef1 Mon Sep 17 00:00:00 2001 From: klensy Date: Thu, 10 Jul 2025 12:09:45 +0300 Subject: [PATCH 3/3] sync pest dep versions too --- Cargo.lock | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 946767e08..dc27c2ca3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1885,9 +1885,9 @@ dependencies = [ [[package]] name = "pest_derive" -version = "2.5.6" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a81186863f3d0a27340815be8f2078dd8050b14cd71913db9fbda795e5f707d7" +checksum = "bb056d9e8ea77922845ec74a1c4e8fb17e7c218cc4fc11a15c5d25e189aa40bc" dependencies = [ "pest", "pest_generator", @@ -1895,24 +1895,23 @@ dependencies = [ [[package]] name = "pest_generator" -version = "2.5.6" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75a1ef20bf3193c15ac345acb32e26b3dc3223aff4d77ae4fc5359567683796b" +checksum = "87e404e638f781eb3202dc82db6760c8ae8a1eeef7fb3fa8264b2ef280504966" dependencies = [ "pest", "pest_meta", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.87", ] [[package]] name = "pest_meta" -version = "2.5.6" +version = "2.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3b284b1f13a20dc5ebc90aff59a51b8d7137c221131b52a7260c08cbc1cc80" +checksum = "edd1101f170f5903fde0914f899bb503d9ff5271d7ba76bbb70bea63690cc0d5" dependencies = [ - "once_cell", "pest", "sha2", ]