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

* 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](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] <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>
This commit is contained in:
dependabot[bot] 2024-12-06 19:53:44 +00:00 committed by GitHub
parent a39eb30614
commit 1653b08068
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
38 changed files with 108 additions and 86 deletions

View File

@ -87,7 +87,7 @@ dependencies = [
"nom",
"num-traits",
"rusticata-macros",
"thiserror",
"thiserror 1.0.69",
"time",
]
@ -861,7 +861,7 @@ dependencies = [
"ipnet",
"once_cell",
"rand",
"thiserror",
"thiserror 1.0.69",
"tinyvec",
"tokio",
"tracing",
@ -884,7 +884,7 @@ dependencies = [
"rand",
"resolv-conf",
"smallvec",
"thiserror",
"thiserror 1.0.69",
"tokio",
"tracing",
]
@ -1292,7 +1292,7 @@ dependencies = [
"http",
"ipnet",
"linkerd-dns-name",
"thiserror",
"thiserror 2.0.4",
]
[[package]]
@ -1311,7 +1311,7 @@ dependencies = [
"linkerd-tonic-stream",
"rangemap",
"regex",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-stream",
"tonic",
@ -1334,7 +1334,7 @@ dependencies = [
"pprof",
"serde",
"serde_json",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tower",
"tracing",
@ -1400,7 +1400,7 @@ dependencies = [
"regex",
"semver",
"serde_json",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-stream",
"tonic",
@ -1421,7 +1421,7 @@ dependencies = [
"linkerd-proxy-client-policy",
"linkerd-proxy-server-policy",
"once_cell",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-test",
"tonic",
@ -1457,7 +1457,7 @@ dependencies = [
"once_cell",
"parking_lot",
"rangemap",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-test",
"tonic",
@ -1535,7 +1535,7 @@ dependencies = [
"parking_lot",
"pin-project",
"prometheus-client",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-rustls",
"tokio-test",
@ -1562,7 +1562,7 @@ dependencies = [
"parking_lot",
"pin-project",
"regex",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-stream",
"tokio-test",
@ -1585,7 +1585,7 @@ dependencies = [
"linkerd-error",
"linkerd-io",
"linkerd-stack",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tower",
"tracing",
@ -1613,7 +1613,7 @@ dependencies = [
"hickory-resolver",
"linkerd-dns-name",
"linkerd-error",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tracing",
]
@ -1622,7 +1622,7 @@ dependencies = [
name = "linkerd-dns-name"
version = "0.1.0"
dependencies = [
"thiserror",
"thiserror 2.0.4",
"untrusted",
]
@ -1647,7 +1647,7 @@ name = "linkerd-error"
version = "0.1.0"
dependencies = [
"futures",
"thiserror",
"thiserror 2.0.4",
]
[[package]]
@ -1668,7 +1668,7 @@ dependencies = [
"pin-project",
"quickcheck",
"rand",
"thiserror",
"thiserror 2.0.4",
"tokio",
]
@ -1789,7 +1789,7 @@ dependencies = [
"parking_lot",
"pin-project",
"prometheus-client",
"thiserror",
"thiserror 2.0.4",
"tokio",
]
@ -1820,7 +1820,7 @@ dependencies = [
"linkerd-stack",
"linkerd-tracing",
"parking_lot",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tower",
"tracing",
@ -1835,7 +1835,7 @@ dependencies = [
"maplit",
"rand",
"regex",
"thiserror",
"thiserror 2.0.4",
"tracing",
"url",
]
@ -1851,7 +1851,7 @@ dependencies = [
"linkerd-stack",
"parking_lot",
"pin-project",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tracing",
]
@ -1883,7 +1883,7 @@ name = "linkerd-http-version"
version = "0.1.0"
dependencies = [
"http",
"thiserror",
"thiserror 2.0.4",
]
[[package]]
@ -1894,7 +1894,7 @@ dependencies = [
"linkerd-error",
"linkerd-metrics",
"prometheus-client",
"thiserror",
"thiserror 2.0.4",
"tracing",
"url",
]
@ -1987,7 +1987,7 @@ dependencies = [
"ring",
"rustls-pemfile",
"rustls-webpki",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-rustls",
"tracing",
@ -2075,7 +2075,7 @@ dependencies = [
"linkerd-pool",
"linkerd-stack",
"parking_lot",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tower-test",
"tracing",
@ -2169,7 +2169,7 @@ dependencies = [
"parking_lot",
"pin-project",
"prometheus-client",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-stream",
"tokio-test",
@ -2197,7 +2197,7 @@ dependencies = [
"once_cell",
"prost-types",
"quickcheck",
"thiserror",
"thiserror 2.0.4",
"tonic",
]
@ -2260,7 +2260,7 @@ dependencies = [
"parking_lot",
"pin-project",
"rand",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-test",
"tower",
@ -2283,7 +2283,7 @@ dependencies = [
"linkerd2-proxy-api",
"parking_lot",
"pin-project",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tonic",
"tracing",
@ -2297,7 +2297,7 @@ dependencies = [
"linkerd-error",
"linkerd-proxy-core",
"pin-project",
"thiserror",
"thiserror 2.0.4",
"tower",
"tracing",
]
@ -2315,7 +2315,7 @@ dependencies = [
"maplit",
"prost-types",
"quickcheck",
"thiserror",
"thiserror 2.0.4",
"tokio",
]
@ -2333,7 +2333,7 @@ dependencies = [
"rcgen",
"simple_asn1",
"spiffe-proto",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-test",
"tonic",
@ -2363,7 +2363,7 @@ dependencies = [
"prost-types",
"quickcheck",
"rand",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tonic",
"tower",
@ -2395,7 +2395,7 @@ dependencies = [
"linkerd-io",
"linkerd-stack",
"socket2",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-stream",
"tracing",
@ -2438,7 +2438,7 @@ dependencies = [
"linkerd-error",
"linkerd-stack",
"parking_lot",
"thiserror",
"thiserror 2.0.4",
"tracing",
]
@ -2463,7 +2463,7 @@ dependencies = [
"prost-types",
"quickcheck",
"regex",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-stream",
"tonic",
@ -2488,7 +2488,7 @@ dependencies = [
"linkerd-tracing",
"parking_lot",
"pin-project",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tokio-test",
"tokio-util",
@ -2544,7 +2544,7 @@ dependencies = [
"linkerd-stack",
"linkerd-tracing",
"pin-project",
"thiserror",
"thiserror 2.0.4",
"tokio",
"tower",
"tracing",
@ -2560,7 +2560,7 @@ dependencies = [
"linkerd2-proxy-api",
"rand",
"regex",
"thiserror",
"thiserror 2.0.4",
"tracing",
]
@ -2611,7 +2611,7 @@ dependencies = [
"linkerd-error",
"linkerd-stack",
"rand",
"thiserror",
"thiserror 1.0.69",
"tower",
"tracing",
]
@ -2692,7 +2692,7 @@ dependencies = [
"prost",
"prost-types",
"quickcheck",
"thiserror",
"thiserror 1.0.69",
"tonic",
]
@ -2954,7 +2954,7 @@ dependencies = [
"futures-sink",
"js-sys",
"pin-project-lite",
"thiserror",
"thiserror 1.0.69",
"tracing",
]
@ -2981,7 +2981,7 @@ dependencies = [
"opentelemetry",
"percent-encoding",
"rand",
"thiserror",
"thiserror 1.0.69",
]
[[package]]
@ -3111,7 +3111,7 @@ dependencies = [
"smallvec",
"symbolic-demangle",
"tempfile",
"thiserror",
"thiserror 1.0.69",
]
[[package]]
@ -3564,7 +3564,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085"
dependencies = [
"num-bigint",
"num-traits",
"thiserror",
"thiserror 1.0.69",
"time",
]
@ -3701,18 +3701,38 @@ dependencies = [
[[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.68"
version = "1.0.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e"
checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "thiserror-impl"
version = "2.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061"
dependencies = [
"proc-macro2",
"quote",
@ -4409,7 +4429,7 @@ dependencies = [
"nom",
"oid-registry",
"rusticata-macros",
"thiserror",
"thiserror 1.0.69",
"time",
]

View File

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

View File

@ -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)'] }

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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)]

View File

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

View File

@ -7,5 +7,5 @@ edition = "2021"
publish = false
[dependencies]
thiserror = "1"
thiserror = "2"
untrusted = "0.9"

View File

@ -10,4 +10,4 @@ publish = false
futures = { version = "0.3", default-features = false }
[dev-dependencies]
thiserror = "1"
thiserror = "2"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -11,4 +11,4 @@ HTTP version types.
[dependencies]
http = "0.2"
thiserror = "1"
thiserror = "2"

View File

@ -8,7 +8,7 @@ publish = false
[dependencies]
prometheus-client = "0.22"
thiserror = "1"
thiserror = "2"
tracing = "0.1"
url = "2.5.4"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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