Merge pull request #2199 from klensy/thiserror2

drop thiserror@1 dep

Author: Kobzol

Cargo.lock

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

collector/Cargo.toml

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

collector/src/artifact_stats.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"

collector/src/runtime/benchmark.rs

@@ -42,10 +42,10 @@ 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 = [
+rust-embed = { version = "8.2.0", features = [
     "include-exclude",
     "interpolate-folder-path",
 ] }