diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 3e73859ed6..9c9e65966f 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -55,4 +55,4 @@ jobs: # Some tests are especially flakey in coverage tests. That's fine. We # only really care to measure how much of our codebase is covered. continue-on-error: true - - uses: codecov/codecov-action@5ecb98a3c6b747ed38dc09f787459979aebb39be + - uses: codecov/codecov-action@b9fd7d16f6d7d1b5d2bec1a2887e65ceed900238 diff --git a/.github/workflows/markdown.yml b/.github/workflows/markdown.yml index 0e8759000c..e26407769b 100644 --- a/.github/workflows/markdown.yml +++ b/.github/workflows/markdown.yml @@ -15,6 +15,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b - - uses: DavidAnson/markdownlint-cli2-action@b4c9feab76d8025d1e83c653fa3990936df0e6c8 + - uses: DavidAnson/markdownlint-cli2-action@db43aef879112c3119a410d69f66701e0d530809 with: globs: "**/*.md" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6d0d8b3105..495115f7a6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -150,7 +150,7 @@ jobs: - run: just arch=${{ matrix.arch }} libc=${{ matrix.libc }} rustup - run: just arch=${{ matrix.arch }} libc=${{ matrix.libc }} profile=${{ needs.meta.outputs.profile }} build - run: just arch=${{ matrix.arch }} libc=${{ matrix.libc }} profile=${{ needs.meta.outputs.profile }} package - - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 + - uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 with: name: ${{ matrix.arch }}-artifacts path: target/package/* @@ -180,7 +180,7 @@ jobs: ref: ${{ needs.meta.outputs.ref }} - run: git tag -a -m "$VERSION" "$TAG" # Fetch the artifacts. - - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e + - uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 with: path: artifacts - run: du -h artifacts/**/* @@ -188,7 +188,7 @@ jobs: - if: needs.meta.outputs.publish == 'true' run: git push origin "$TAG" - if: needs.meta.outputs.publish == 'true' - uses: softprops/action-gh-release@69320dbe05506a9a39fc8ae11030b214ec2d1f87 + uses: softprops/action-gh-release@e7a8f85e1c67a31e6ed99a94b41bd0b71bbee6b8 with: name: ${{ env.VERSION }} tag_name: ${{ env.TAG }} diff --git a/Cargo.lock b/Cargo.lock index 65823d76a8..71b1b7f2ee 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -72,7 +72,7 @@ dependencies = [ "nom", "num-traits", "rusticata-macros", - "thiserror", + "thiserror 1.0.68", "time", ] @@ -778,7 +778,7 @@ dependencies = [ "ipnet", "once_cell", "rand", - "thiserror", + "thiserror 1.0.68", "tinyvec", "tokio", "tracing", @@ -801,7 +801,7 @@ dependencies = [ "rand", "resolv-conf", "smallvec", - "thiserror", + "thiserror 1.0.68", "tokio", "tracing", ] @@ -1060,7 +1060,7 @@ dependencies = [ "http", "ipnet", "linkerd-dns-name", - "thiserror", + "thiserror 2.0.0", ] [[package]] @@ -1078,7 +1078,7 @@ dependencies = [ "linkerd-tonic-stream", "rangemap", "regex", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-stream", "tonic", @@ -1100,7 +1100,7 @@ dependencies = [ "pprof", "serde", "serde_json", - "thiserror", + "thiserror 2.0.0", "tokio", "tower", "tracing", @@ -1165,7 +1165,7 @@ dependencies = [ "regex", "semver", "serde_json", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-stream", "tonic", @@ -1186,7 +1186,7 @@ dependencies = [ "linkerd-proxy-client-policy", "linkerd-proxy-server-policy", "once_cell", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-test", "tonic", @@ -1222,7 +1222,7 @@ dependencies = [ "once_cell", "parking_lot", "rangemap", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-test", "tonic", @@ -1295,7 +1295,7 @@ dependencies = [ "parking_lot", "pin-project", "prometheus-client", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-test", "tonic", @@ -1321,7 +1321,7 @@ dependencies = [ "parking_lot", "pin-project", "regex", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-stream", "tokio-test", @@ -1344,7 +1344,7 @@ dependencies = [ "linkerd-error", "linkerd-io", "linkerd-stack", - "thiserror", + "thiserror 2.0.0", "tokio", "tower", "tracing", @@ -1373,7 +1373,7 @@ dependencies = [ "hickory-resolver", "linkerd-dns-name", "linkerd-error", - "thiserror", + "thiserror 2.0.0", "tokio", "tracing", ] @@ -1382,7 +1382,7 @@ dependencies = [ name = "linkerd-dns-name" version = "0.1.0" dependencies = [ - "thiserror", + "thiserror 2.0.0", "untrusted", ] @@ -1407,7 +1407,7 @@ name = "linkerd-error" version = "0.1.0" dependencies = [ "futures", - "thiserror", + "thiserror 2.0.0", ] [[package]] @@ -1428,7 +1428,7 @@ dependencies = [ "pin-project", "quickcheck", "rand", - "thiserror", + "thiserror 2.0.0", "tokio", ] @@ -1507,7 +1507,7 @@ dependencies = [ "linkerd-stack", "linkerd-tracing", "parking_lot", - "thiserror", + "thiserror 2.0.0", "tokio", "tracing", ] @@ -1521,7 +1521,7 @@ dependencies = [ "maplit", "rand", "regex", - "thiserror", + "thiserror 2.0.0", "tracing", "url", ] @@ -1534,7 +1534,7 @@ dependencies = [ "linkerd-error", "linkerd-metrics", "prometheus-client", - "thiserror", + "thiserror 2.0.0", "tracing", "url", ] @@ -1627,7 +1627,7 @@ dependencies = [ "ring", "rustls-pemfile", "rustls-webpki", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-rustls", "tracing", @@ -1691,7 +1691,7 @@ dependencies = [ "linkerd-pool", "linkerd-stack", "parking_lot", - "thiserror", + "thiserror 2.0.0", "tokio", "tower-test", "tracing", @@ -1785,7 +1785,7 @@ dependencies = [ "parking_lot", "pin-project", "prometheus-client", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-stream", "tokio-test", @@ -1811,7 +1811,7 @@ dependencies = [ "once_cell", "prost-types", "quickcheck", - "thiserror", + "thiserror 2.0.0", "tonic", ] @@ -1866,7 +1866,7 @@ dependencies = [ "linkerd-tracing", "pin-project", "rand", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-test", "tower", @@ -1889,7 +1889,7 @@ dependencies = [ "linkerd2-proxy-api", "parking_lot", "pin-project", - "thiserror", + "thiserror 2.0.0", "tokio", "tonic", "tracing", @@ -1903,7 +1903,7 @@ dependencies = [ "linkerd-error", "linkerd-proxy-core", "pin-project", - "thiserror", + "thiserror 2.0.0", "tower", "tracing", ] @@ -1919,7 +1919,7 @@ dependencies = [ "maplit", "prost-types", "quickcheck", - "thiserror", + "thiserror 2.0.0", ] [[package]] @@ -1936,7 +1936,7 @@ dependencies = [ "rcgen", "simple_asn1", "spiffe-proto", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-test", "tonic", @@ -1966,7 +1966,7 @@ dependencies = [ "prost-types", "quickcheck", "rand", - "thiserror", + "thiserror 2.0.0", "tokio", "tonic", "tower", @@ -1998,7 +1998,7 @@ dependencies = [ "linkerd-io", "linkerd-stack", "socket2", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-stream", "tracing", @@ -2041,7 +2041,7 @@ dependencies = [ "linkerd-error", "linkerd-stack", "parking_lot", - "thiserror", + "thiserror 2.0.0", "tracing", ] @@ -2066,7 +2066,7 @@ dependencies = [ "prost-types", "quickcheck", "regex", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-stream", "tonic", @@ -2091,7 +2091,7 @@ dependencies = [ "linkerd-tracing", "parking_lot", "pin-project", - "thiserror", + "thiserror 2.0.0", "tokio", "tokio-test", "tokio-util", @@ -2147,7 +2147,7 @@ dependencies = [ "linkerd-stack", "linkerd-tracing", "pin-project", - "thiserror", + "thiserror 2.0.0", "tokio", "tower", "tracing", @@ -2201,7 +2201,7 @@ dependencies = [ "linkerd-error", "linkerd-stack", "rand", - "thiserror", + "thiserror 1.0.68", "tower", "tracing", ] @@ -2281,7 +2281,7 @@ dependencies = [ "prost", "prost-types", "quickcheck", - "thiserror", + "thiserror 1.0.68", "tonic", ] @@ -2626,7 +2626,7 @@ dependencies = [ "smallvec", "symbolic-demangle", "tempfile", - "thiserror", + "thiserror 1.0.68", ] [[package]] @@ -2647,9 +2647,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.82" +version = "1.0.89" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b" +checksum = "f139b0662de085916d1fb67d2b4169d1addddda1919e696f3252b740b629986e" dependencies = [ "unicode-ident", ] @@ -3076,7 +3076,7 @@ checksum = "adc4e5204eb1910f40f9cfa375f6f05b68c3abac4b6fd879c8ff5e7ae8a0a085" dependencies = [ "num-bigint", "num-traits", - "thiserror", + "thiserror 1.0.68", "time", ] @@ -3153,9 +3153,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.60" +version = "2.0.87" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "909518bc7b1c9b779f1bbf07f2929d35af9f0f37e47c6e9ef7f9dddc1e1821f3" +checksum = "25aa4ce346d03a6dcd68dd8b4010bcb74e54e62c90c573f394c46eae99aba32d" dependencies = [ "proc-macro2", "quote", @@ -3203,18 +3203,38 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.60" +version = "1.0.68" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "579e9083ca58dd9dcf91a9923bb9054071b9ebbd800b342194c9feb0ee89fc18" +checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.68", +] + +[[package]] +name = "thiserror" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15291287e9bff1bc6f9ff3409ed9af665bec7a5fc8ac079ea96be07bca0e2668" +dependencies = [ + "thiserror-impl 2.0.0", +] + +[[package]] +name = "thiserror-impl" +version = "1.0.68" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] name = "thiserror-impl" -version = "1.0.60" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2470041c06ec3ac1ab38d0356a6119054dedaea53e12fbefc0de730a1c08524" +checksum = "22efd00f33f93fa62848a7cab956c3d38c8d43095efda1decfc2b3a5dc0b8972" dependencies = [ "proc-macro2", "quote", @@ -3811,7 +3831,7 @@ dependencies = [ "nom", "oid-registry", "rusticata-macros", - "thiserror", + "thiserror 1.0.68", "time", ] diff --git a/linkerd/addr/Cargo.toml b/linkerd/addr/Cargo.toml index 8cfd9faec9..3becec9076 100644 --- a/linkerd/addr/Cargo.toml +++ b/linkerd/addr/Cargo.toml @@ -10,4 +10,4 @@ publish = false http = "0.2" ipnet = "2.7" linkerd-dns-name = { path = "../dns/name" } -thiserror = "1" +thiserror = "2" diff --git a/linkerd/app/Cargo.toml b/linkerd/app/Cargo.toml index af443530a3..b15630bc08 100644 --- a/linkerd/app/Cargo.toml +++ b/linkerd/app/Cargo.toml @@ -28,7 +28,7 @@ linkerd-opencensus = { path = "../opencensus" } 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 index cfac00cb03..be0a58f673 100644 --- a/linkerd/app/admin/Cargo.toml +++ b/linkerd/app/admin/Cargo.toml @@ -22,7 +22,7 @@ futures = { version = "0.3", default-features = false } pprof = { version = "0.13", 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 index f18c234a7a..dbd2b67fca 100644 --- a/linkerd/app/core/Cargo.toml +++ b/linkerd/app/core/Cargo.toml @@ -23,7 +23,7 @@ ipnet = "2.7" 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 index 86603399ab..c95f5795e3 100644 --- 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 index cad07a4f26..7a2c6351aa 100644 --- a/linkerd/app/inbound/Cargo.toml +++ b/linkerd/app/inbound/Cargo.toml @@ -34,7 +34,7 @@ linkerd2-proxy-api = { version = "0.13", 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 index 0d4a68c889..700e952140 100644 --- a/linkerd/app/outbound/Cargo.toml +++ b/linkerd/app/outbound/Cargo.toml @@ -24,7 +24,7 @@ linkerd2-proxy-api = { version = "0.13", features = ["outbound"] } once_cell = "1" parking_lot = "0.12" 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 index 1afee2908c..ee986b6646 100644 --- 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 index 18392fd10c..4ca72b7e32 100644 --- 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/dns/Cargo.toml b/linkerd/dns/Cargo.toml index 1d37bfb530..282d66a61b 100644 --- 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 index f025b58ac2..35e01062e5 100644 --- 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 index 7bdd515161..e0fec456c7 100644 --- 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 index c221ca9111..b550abef73 100644 --- 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/retry/Cargo.toml b/linkerd/http/retry/Cargo.toml index ba2f001d06..676106d75c 100644 --- a/linkerd/http/retry/Cargo.toml +++ b/linkerd/http/retry/Cargo.toml @@ -13,7 +13,7 @@ http-body = "0.4" http = "0.2" parking_lot = "0.12" tracing = "0.1" -thiserror = "1" +thiserror = "2" linkerd-error = { path = "../../error" } linkerd-stack = { path = "../../stack" } diff --git a/linkerd/http/route/Cargo.toml b/linkerd/http/route/Cargo.toml index 43bb594925..d80202d6ac 100644 --- 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/identity/Cargo.toml b/linkerd/identity/Cargo.toml index c053377b1b..63ff891418 100644 --- 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.0" diff --git a/linkerd/meshtls/rustls/Cargo.toml b/linkerd/meshtls/rustls/Cargo.toml index 5a09ea31e4..cb2fd01925 100644 --- 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 index 50aecace25..ec6fa8e135 100644 --- 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 index c55743a681..4fa0bdb682 100644 --- 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 index 7877924075..a1dee32028 100644 --- a/linkerd/proxy/client-policy/Cargo.toml +++ b/linkerd/proxy/client-policy/Cargo.toml @@ -21,7 +21,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 index ea24295365..936fedb9db 100644 --- a/linkerd/proxy/http/Cargo.toml +++ b/linkerd/proxy/http/Cargo.toml @@ -31,7 +31,7 @@ hyper = { version = "0.14", features = [ hyper-balance = { path = "../../../hyper-balance" } 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 index 3d199200d9..d7b2ae49b0 100644 --- 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 index b997674cd8..d7ab15790e 100644 --- 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 index 314286d051..b1f84b8f24 100644 --- a/linkerd/proxy/server-policy/Cargo.toml +++ b/linkerd/proxy/server-policy/Cargo.toml @@ -13,7 +13,7 @@ proto = ["linkerd-http-route/proto", "linkerd2-proxy-api", "prost-types"] ipnet = "2" http = "0.2" prost-types = { version = "0.12", optional = true } -thiserror = "1" +thiserror = "2" linkerd-http-route = { path = "../../http/route" } diff --git a/linkerd/proxy/spire-client/Cargo.toml b/linkerd/proxy/spire-client/Cargo.toml index 300d7d6dc0..61c2e0fe94 100644 --- 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 index ac437fb270..e79c00e602 100644 --- 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 index 5d8c7e2952..86260e07bd 100644 --- 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 index 2208766780..ed966f2952 100644 --- 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 index ccc9af5e70..7476fd40aa 100644 --- 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 index 62c2c0c007..612cb8e0d3 100644 --- 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 index 3600ef2c69..e7d576dba9 100644 --- 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"