From 9cac815f138cc8cd6a57a2382c77d18320f2dcb9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 6 Dec 2024 20:01:04 +0000 Subject: [PATCH] build(deps): bump thiserror from 1.0.68 to 2.0.4 (#13435) Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.68 to 2.0.4. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](https://github.com/dtolnay/thiserror/compare/1.0.68...2.0.4) --- updated-dependencies: - dependency-name: thiserror dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- Cargo.lock | 58 +++++++++++++++++-------- deny.toml | 2 + policy-controller/k8s/api/Cargo.toml | 2 +- policy-controller/k8s/index/Cargo.toml | 2 +- policy-controller/k8s/status/Cargo.toml | 2 +- policy-controller/runtime/Cargo.toml | 2 +- 6 files changed, 45 insertions(+), 23 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7fed92432f0d9..8f7b6d6070a41 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -918,7 +918,7 @@ checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" dependencies = [ "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -931,7 +931,7 @@ dependencies = [ "pest_derive", "regex", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1006,7 +1006,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-tungstenite", "tokio-util", @@ -1030,7 +1030,7 @@ dependencies = [ "schemars", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1066,7 +1066,7 @@ dependencies = [ "serde", "serde_json", "smallvec", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-util", "tracing", @@ -1100,7 +1100,7 @@ dependencies = [ "rustls-pemfile", "serde", "serde_json", - "thiserror", + "thiserror 1.0.69", "tokio", "tokio-rustls", "tower", @@ -1217,7 +1217,7 @@ dependencies = [ "serde", "serde_json", "serde_yaml", - "thiserror", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -1239,7 +1239,7 @@ dependencies = [ "maplit", "parking_lot", "prometheus-client", - "thiserror", + "thiserror 2.0.4", "tokio", "tokio-stream", "tokio-test", @@ -1261,7 +1261,7 @@ dependencies = [ "prometheus-client", "serde", "serde_json", - "thiserror", + "thiserror 2.0.4", "tokio", "tracing", ] @@ -1291,7 +1291,7 @@ dependencies = [ "regex", "serde", "serde_json", - "thiserror", + "thiserror 2.0.4", "tokio", "tokio-stream", "tonic", @@ -1336,7 +1336,7 @@ dependencies = [ "ipnet", "prost", "prost-types", - "thiserror", + "thiserror 1.0.69", "tonic", ] @@ -1564,7 +1564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.69", "ucd-trie", ] @@ -2178,18 +2178,38 @@ checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" [[package]] name = "thiserror" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490" +dependencies = [ + "thiserror-impl 2.0.4", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.69" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.87", ] [[package]] name = "thiserror-impl" -version = "1.0.68" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061" dependencies = [ "proc-macro2", "quote", @@ -2519,7 +2539,7 @@ dependencies = [ "log", "rand", "sha1", - "thiserror", + "thiserror 1.0.69", "url", "utf-8", ] diff --git a/deny.toml b/deny.toml index ce185be1be0e4..16076adaccee1 100644 --- a/deny.toml +++ b/deny.toml @@ -62,6 +62,8 @@ skip-tree = [ # `serde_json` and `h2` depend on diverged versions of `indexmap` (2.0.x and # 1.9.x, respectively) { name = "indexmap" }, + # thiserror v2 is still making its way through the ecosystem + { name = "thiserror", version = "1" }, ] [sources] diff --git a/policy-controller/k8s/api/Cargo.toml b/policy-controller/k8s/api/Cargo.toml index 507269ae022f4..0fe162be403fd 100644 --- a/policy-controller/k8s/api/Cargo.toml +++ b/policy-controller/k8s/api/Cargo.toml @@ -18,6 +18,6 @@ schemars = "0.8" serde = { version = "1", features = ["derive"] } serde_json = "1" serde_yaml = "0.9" -thiserror = "1" +thiserror = "2" tokio = { version = "1", features = ["time"] } tracing = "0.1" diff --git a/policy-controller/k8s/index/Cargo.toml b/policy-controller/k8s/index/Cargo.toml index f4f679d73d2d0..43798e285c178 100644 --- a/policy-controller/k8s/index/Cargo.toml +++ b/policy-controller/k8s/index/Cargo.toml @@ -21,7 +21,7 @@ linkerd-policy-controller-core = { path = "../../core" } linkerd-policy-controller-k8s-api = { path = "../api" } parking_lot = "0.12" prometheus-client = { version = "0.22.3", default-features = false } -thiserror = "1" +thiserror = "2" tokio = { version = "1", features = ["macros", "rt", "sync"] } tracing = "0.1" diff --git a/policy-controller/k8s/status/Cargo.toml b/policy-controller/k8s/status/Cargo.toml index 3b9ec9c514cf3..3499fb5565235 100644 --- a/policy-controller/k8s/status/Cargo.toml +++ b/policy-controller/k8s/status/Cargo.toml @@ -20,7 +20,7 @@ parking_lot = "0.12" prometheus-client = { version = "0.22.3", default-features = false } serde = "1" serde_json = "1.0.133" -thiserror = "1" +thiserror = "2" tokio = { version = "1", features = ["macros"] } tracing = "0.1.41" diff --git a/policy-controller/runtime/Cargo.toml b/policy-controller/runtime/Cargo.toml index 45dfcfad34f5c..0a70e6fe21269 100644 --- a/policy-controller/runtime/Cargo.toml +++ b/policy-controller/runtime/Cargo.toml @@ -26,7 +26,7 @@ parking_lot = "0.12" prometheus-client = { version = "0.22.3", default-features = false } serde = "1" serde_json = "1" -thiserror = "1" +thiserror = "2" tokio-stream = { version = "0.1", features = ["sync"] } tracing = "0.1" regex = "1"