build(deps): bump thiserror from 1.0.68 to 2.0.4 (#3417)

dependabot[bot] · olix0r · web-flow · commit 1653b08068b9 · 2024-12-06T19:53:44.000Z
* build(deps): bump thiserror from 1.0.68 to 2.0.4 Bumps [thiserror](https://github.com/dtolnay/thiserror) from 1.0.68 to 2.0.4. - [Release notes](https://github.com/dtolnay/thiserror/releases) - [Commits](dtolnay/thiserror@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] <support@github.com> * chore(deny): allow duplicate versions of thiserror * chore(detect): fix thiserror usage --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Oliver Gould <ver@buoyant.io>
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/deny.toml b/deny.toml
@@ -66,6 +66,8 @@ skip = [
     { name = "hashbrown", version = "0.12" },
 ]
 skip-tree = [
+    # thiserror v2 is still propagating through the ecosystem
+    { name = "thiserror", version = "1" },
 ]
 
 [sources]
diff --git a/linkerd/addr/Cargo.toml b/linkerd/addr/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 http = "0.2"
 ipnet = "2.10"
 linkerd-dns-name = { path = "../dns/name" }
-thiserror = "1"
+thiserror = "2"
 
 [lints.rust]
 unexpected_cfgs = { level = "warn", check-cfg = ['cfg(fuzzing)'] }
diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml
@@ -29,7 +29,7 @@ linkerd-opentelemetry = { path = "../opentelemetry" }
 linkerd-tonic-stream = { path = "../tonic-stream" }
 rangemap = "1"
 regex = "1"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["rt"] }
 tokio-stream = { version = "0.1", features = ["time", "sync"] }
 tonic = { version = "0.10", default-features = false, features = ["prost"] }
diff --git a/linkerd/app/admin/Cargo.toml b/linkerd/app/admin/Cargo.toml
@@ -23,7 +23,7 @@ futures = { version = "0.3", default-features = false }
 pprof = { version = "0.14", optional = true, features = ["prost-codec"] }
 serde = "1"
 serde_json = "1"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
 tracing = "0.1"
 
diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml
@@ -23,7 +23,7 @@ ipnet = "2.10"
 prometheus-client = "0.22"
 regex = "1"
 serde_json = "1"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["macros", "sync", "parking_lot"] }
 tokio-stream = { version = "0.1", features = ["time"] }
 tonic = { version = "0.10", default-features = false, features = ["prost"] }
diff --git a/linkerd/app/gateway/Cargo.toml b/linkerd/app/gateway/Cargo.toml
@@ -14,7 +14,7 @@ linkerd-app-inbound = { path = "../inbound" }
 linkerd-app-outbound = { path = "../outbound" }
 linkerd-proxy-client-policy = { path = "../../proxy/client-policy" }
 once_cell = "1"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["sync"] }
 tonic = { version = "0.10", default-features = false }
 tower = { version = "0.4", default-features = false }
diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml
@@ -34,7 +34,7 @@ linkerd2-proxy-api = { workspace = true, features = ["inbound"] }
 once_cell = "1"
 parking_lot = "0.12"
 rangemap = "1"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["sync"] }
 tonic = { version = "0.10", default-features = false }
 tower = { version = "0.4", features = ["util"] }
diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml
@@ -27,7 +27,7 @@ once_cell = "1"
 parking_lot = "0.12"
 pin-project = "1"
 prometheus-client = "0.22"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["sync"] }
 tonic = { version = "0.10", default-features = false }
 tower = { version = "0.4", features = ["util"] }
diff --git a/linkerd/app/test/Cargo.toml b/linkerd/app/test/Cargo.toml
@@ -32,7 +32,7 @@ tokio-stream = { version = "0.1", features = ["sync"] }
 tonic = { version = "0.10", default-features = false, optional = true }
 tower = { version = "0.4", default-features = false }
 tracing = "0.1"
-thiserror = "1"
+thiserror = "2"
 
 [dependencies.tracing-subscriber]
 version = "0.3"
diff --git a/linkerd/detect/Cargo.toml b/linkerd/detect/Cargo.toml
@@ -13,6 +13,6 @@ linkerd-error = { path = "../error" }
 linkerd-io = { path = "../io" }
 linkerd-stack = { path = "../stack" }
 tokio = { version = "1", features = ["time"] }
-thiserror = "1"
+thiserror = "2"
 tower = "0.4"
 tracing = "0.1"
diff --git a/linkerd/detect/src/lib.rs b/linkerd/detect/src/lib.rs
@@ -31,7 +31,7 @@ pub trait Detect<I>: Clone + Send + Sync + 'static {
 pub type Result<P> = StdResult<Option<P>, DetectTimeoutError<P>>;
 
 #[derive(Error)]
-#[error("{} protocol detection timed out after {0:?}", std::any::type_name::<P>())]
+#[error("{typ} protocol detection timed out after {0:?}", typ=std::any::type_name::<P>())]
 pub struct DetectTimeoutError<P>(time::Duration, std::marker::PhantomData<P>);
 
 #[derive(Copy, Clone, Debug)]
diff --git a/linkerd/dns/Cargo.toml b/linkerd/dns/Cargo.toml
@@ -10,7 +10,7 @@ publish = false
 futures = { version = "0.3", default-features = false }
 linkerd-dns-name = { path = "./name" }
 linkerd-error = { path = "../error" }
-thiserror = "1"
+thiserror = "2"
 tracing = "0.1"
 hickory-resolver = "0.24.1"
 tokio = { version = "1", features = ["rt", "sync", "time"] }
diff --git a/linkerd/dns/name/Cargo.toml b/linkerd/dns/name/Cargo.toml
@@ -7,5 +7,5 @@ edition = "2021"
 publish = false
 
 [dependencies]
-thiserror = "1"
+thiserror = "2"
 untrusted = "0.9"
diff --git a/linkerd/error/Cargo.toml b/linkerd/error/Cargo.toml
@@ -10,4 +10,4 @@ publish = false
 futures = { version = "0.3", default-features = false }
 
 [dev-dependencies]
-thiserror = "1"
+thiserror = "2"
diff --git a/linkerd/exp-backoff/Cargo.toml b/linkerd/exp-backoff/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 [dependencies]
 futures = { version = "0.3", default-features = false }
 rand = { version = "0.8", features = ["small_rng"] }
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["time"] }
 pin-project = "1"
 
diff --git a/linkerd/http/prom/Cargo.toml b/linkerd/http/prom/Cargo.toml
@@ -20,7 +20,7 @@ http-body = "0.4"
 parking_lot = "0.12"
 pin-project = "1"
 prometheus-client = "0.22"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["time"] }
 
 linkerd-error = { path = "../../error" }
diff --git a/linkerd/http/retry/Cargo.toml b/linkerd/http/retry/Cargo.toml
@@ -15,7 +15,7 @@ parking_lot = "0.12"
 tokio = { version = "1", features = ["macros", "rt"] }
 tower = { version = "0.4", features = ["retry"] }
 tracing = "0.1"
-thiserror = "1"
+thiserror = "2"
 
 linkerd-http-box = { path = "../box" }
 linkerd-error = { path = "../../error" }
diff --git a/linkerd/http/route/Cargo.toml b/linkerd/http/route/Cargo.toml
@@ -12,7 +12,7 @@ proto = ["linkerd2-proxy-api"]
 http = "0.2"
 regex = "1"
 rand = "0.8"
-thiserror = "1"
+thiserror = "2"
 tracing = "0.1"
 url = "2"
 
diff --git a/linkerd/http/stream-timeouts/Cargo.toml b/linkerd/http/stream-timeouts/Cargo.toml
@@ -15,7 +15,7 @@ http = "0.2"
 http-body = "0.4"
 parking_lot = "0.12"
 pin-project = "1"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", default-features = false }
 tracing = "0.1"
 
diff --git a/linkerd/http/version/Cargo.toml b/linkerd/http/version/Cargo.toml
@@ -11,4 +11,4 @@ HTTP version types.
 
 [dependencies]
 http = "0.2"
-thiserror = "1"
+thiserror = "2"
diff --git a/linkerd/identity/Cargo.toml b/linkerd/identity/Cargo.toml
@@ -8,7 +8,7 @@ publish = false
 
 [dependencies]
 prometheus-client = "0.22"
-thiserror = "1"
+thiserror = "2"
 tracing = "0.1"
 url = "2.5.4"
 
diff --git a/linkerd/meshtls/rustls/Cargo.toml b/linkerd/meshtls/rustls/Cargo.toml
@@ -14,7 +14,7 @@ futures = { version = "0.3", default-features = false }
 ring = { version = "0.17", features = ["std"] }
 rustls-pemfile = "1.0"
 rustls-webpki = { version = "0.101.5", features = ["std"] }
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["macros", "rt", "sync"] }
 tokio-rustls = { version = "0.24", features = ["dangerous_configuration"] }
 tracing = "0.1"
diff --git a/linkerd/pool/mock/Cargo.toml b/linkerd/pool/mock/Cargo.toml
@@ -7,7 +7,7 @@ publish = false
 
 [dependencies]
 parking_lot = "0.12"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["sync", "time"] }
 tower-test = "0.4"
 tracing = "0.1"
diff --git a/linkerd/proxy/balance/queue/Cargo.toml b/linkerd/proxy/balance/queue/Cargo.toml
@@ -11,7 +11,7 @@ futures = { version = "0.3", default-features = false }
 parking_lot = "0.12"
 pin-project = "1"
 prometheus-client = "0.22"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["rt", "sync", "time"] }
 tokio-util = "0.7"
 tracing = "0.1"
diff --git a/linkerd/proxy/client-policy/Cargo.toml b/linkerd/proxy/client-policy/Cargo.toml
@@ -22,7 +22,7 @@ http = "0.2"
 once_cell = { version = "1" }
 prost-types = { version = "0.12", optional = true }
 tonic = { version = "0.10", default-features = false }
-thiserror = { version = "1", optional = true }
+thiserror = { version = "2", optional = true }
 
 linkerd-error = { path = "../../error" }
 linkerd-exp-backoff = { path = "../../exp-backoff" }
diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml
@@ -34,7 +34,7 @@ hyper-balance = { path = "../../../hyper-balance" }
 parking_lot = "0.12"
 pin-project = "1"
 rand = "0.8"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["rt", "sync", "time"] }
 tower = { version = "0.4", default-features = false }
 tracing = "0.1"
diff --git a/linkerd/proxy/identity-client/Cargo.toml b/linkerd/proxy/identity-client/Cargo.toml
@@ -16,7 +16,7 @@ linkerd-metrics = { path = "../../metrics" }
 linkerd-stack = { path = "../../stack" }
 parking_lot = "0.12"
 pin-project = "1"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["time", "sync"] }
 tonic = { version = "0.10", default-features = false }
 tracing = "0.1"
diff --git a/linkerd/proxy/resolve/Cargo.toml b/linkerd/proxy/resolve/Cargo.toml
@@ -13,7 +13,7 @@ Utilities for working with `Resolve` implementations
 futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../../error" }
 linkerd-proxy-core = { path = "../core" }
-thiserror = "1"
+thiserror = "2"
 tower = "0.4"
 tracing = "0.1"
 pin-project = "1"
diff --git a/linkerd/proxy/server-policy/Cargo.toml b/linkerd/proxy/server-policy/Cargo.toml
@@ -15,7 +15,7 @@ governor = { version = "0.7", default-features = false, features = ["std"] }
 ipnet = "2"
 http = "0.2"
 prost-types = { version = "0.12", optional = true }
-thiserror = "1"
+thiserror = "2"
 
 linkerd-http-route = { path = "../../http/route" }
 linkerd-identity = { path = "../../identity" }
diff --git a/linkerd/proxy/spire-client/Cargo.toml b/linkerd/proxy/spire-client/Cargo.toml
@@ -21,7 +21,7 @@ tower = "0.4"
 tracing = "0.1"
 x509-parser = "0.16.0"
 asn1 = { version = "0.6", package = "simple_asn1" }
-thiserror = "1"
+thiserror = "2"
 
 [dev-dependencies]
 rcgen = "0.12.0"
diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml
@@ -22,7 +22,7 @@ linkerd-tls = { path = "../../tls" }
 parking_lot = "0.12"
 prost-types = "0.12"
 rand = { version = "0.8" }
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["time"] }
 tower = { version = "0.4", default-features = false }
 tonic = { version = "0.10", default-features = false }
diff --git a/linkerd/proxy/transport/Cargo.toml b/linkerd/proxy/transport/Cargo.toml
@@ -15,7 +15,7 @@ linkerd-error = { path = "../../error" }
 linkerd-io = { path = "../../io" }
 linkerd-stack = { path = "../../stack" }
 socket2 = "0.5"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["macros", "net"] }
 tokio-stream = { version = "0.1", features = ["net"] }
 tracing = "0.1"
diff --git a/linkerd/router/Cargo.toml b/linkerd/router/Cargo.toml
@@ -9,7 +9,7 @@ publish = false
 ahash = "0.8"
 futures = { version = "0.3", default-features = false }
 parking_lot = "0.12"
-thiserror = "1"
+thiserror = "2"
 tracing = "0.1"
 linkerd-error = { path = "../error" }
 linkerd-stack = { path = "../stack" }
diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml
@@ -22,7 +22,7 @@ tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
 tokio-stream = { version = "0.1", features = ["sync"] }
 tonic = { version = "0.10", default-features = false }
 tower = { version = "0.4.13", features = ["retry", "util"] }
-thiserror = "1"
+thiserror = "2"
 tracing = "0.1"
 
 linkerd-addr = { path = "../addr" }
diff --git a/linkerd/stack/Cargo.toml b/linkerd/stack/Cargo.toml
@@ -17,7 +17,7 @@ futures = { version = "0.3", default-features = false }
 linkerd-error = { path = "../error" }
 parking_lot = "0.12"
 pin-project = "1"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["macros", "rt", "sync", "time"] }
 tokio-util = { version = "0.7" }
 tower = { version = "0.4", features = ["buffer", "filter", "spawn-ready", "util"] }
diff --git a/linkerd/tls/Cargo.toml b/linkerd/tls/Cargo.toml
@@ -17,7 +17,7 @@ linkerd-identity = { path = "../identity" }
 linkerd-io = { path = "../io" }
 linkerd-stack = { path = "../stack" }
 pin-project = "1"
-thiserror = "1"
+thiserror = "2"
 tokio = { version = "1", features = ["macros", "time"] }
 tower = "0.4"
 tracing = "0.1"
diff --git a/linkerd/tls/route/Cargo.toml b/linkerd/tls/route/Cargo.toml
@@ -11,7 +11,7 @@ proto = ["linkerd2-proxy-api"]
 [dependencies]
 regex = "1"
 rand = "0.8"
-thiserror = "1"
+thiserror = "2"
 tracing = "0.1"
 linkerd-tls = { path = "../" }
 linkerd-dns = { path = "../../dns" }

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,8 @@ skip = [`
`66`	`66`	`{ name = "hashbrown", version = "0.12" },`
`67`	`67`	`]`
`68`	`68`	`skip-tree = [`
	`69`	`+ # thiserror v2 is still propagating through the ecosystem`
	`70`	`+ { name = "thiserror", version = "1" },`
`69`	`71`	`]`
`70`	`72`
`71`	`73`	`[sources]`