From 0ff60aa1cb0db8eba4a39d0f3f3f802d43fe2bbb Mon Sep 17 00:00:00 2001 From: katelyn martin Date: Sun, 1 Dec 2024 00:00:00 +0000 Subject: [PATCH] chore(deps): define bytes as a workspace dependency (#3473) this commit modifies the workspace manifest, defining bytes as a workspace dependency. no changes to the lockfile are made because this commit does not affect the dependency graph of the project. * linkerd/linkerd2#8733 Signed-off-by: katelyn martin --- Cargo.toml | 1 + linkerd/app/admin/Cargo.toml | 2 +- linkerd/app/core/Cargo.toml | 2 +- linkerd/app/inbound/Cargo.toml | 2 +- linkerd/app/integration/Cargo.toml | 2 +- linkerd/app/outbound/Cargo.toml | 2 +- linkerd/detect/Cargo.toml | 2 +- linkerd/duplex/Cargo.toml | 2 +- linkerd/http/box/Cargo.toml | 2 +- linkerd/http/metrics/Cargo.toml | 2 +- linkerd/http/prom/Cargo.toml | 2 +- linkerd/http/retry/Cargo.toml | 2 +- linkerd/http/upgrade/Cargo.toml | 2 +- linkerd/io/Cargo.toml | 2 +- linkerd/proxy/http/Cargo.toml | 2 +- linkerd/proxy/tap/Cargo.toml | 2 +- linkerd/service-profiles/Cargo.toml | 2 +- linkerd/tls/Cargo.toml | 2 +- linkerd/trace-context/Cargo.toml | 2 +- linkerd/transport-header/Cargo.toml | 2 +- opencensus-proto/Cargo.toml | 2 +- spiffe-proto/Cargo.toml | 2 +- 22 files changed, 22 insertions(+), 21 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2386ee7d1..1da23c168 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,6 +97,7 @@ debug = 1 lto = true [workspace.dependencies] +bytes = { version = "1" } http = { version = "0.2" } http-body = { version = "0.4" } hyper = { version = "0.14", default-features = false } diff --git a/linkerd/app/admin/Cargo.toml b/linkerd/app/admin/Cargo.toml index a347c015b..a800578bd 100644 --- a/linkerd/app/admin/Cargo.toml +++ b/linkerd/app/admin/Cargo.toml @@ -15,7 +15,7 @@ pprof = ["deflate", "dep:pprof"] log-streaming = ["linkerd-tracing/stream"] [dependencies] -bytes = "1" +bytes = { workspace = true } deflate = { version = "1", optional = true, features = ["gzip"] } http = { workspace = true } http-body = { workspace = true } diff --git a/linkerd/app/core/Cargo.toml b/linkerd/app/core/Cargo.toml index 0323203be..02db292ac 100644 --- a/linkerd/app/core/Cargo.toml +++ b/linkerd/app/core/Cargo.toml @@ -13,7 +13,7 @@ independently of the inbound and outbound proxy logic. """ [dependencies] -bytes = "1" +bytes = { workspace = true } drain = { version = "0.1", features = ["retain"] } http = { workspace = true } http-body = { workspace = true } diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml index d32e37f0a..46d849353 100644 --- a/linkerd/app/inbound/Cargo.toml +++ b/linkerd/app/inbound/Cargo.toml @@ -18,7 +18,7 @@ test-util = [ ] [dependencies] -bytes = "1" +bytes = { workspace = true } http = { workspace = true } futures = { version = "0.3", default-features = false } linkerd-app-core = { path = "../core" } diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml index 8979c4e96..133f82f1d 100644 --- a/linkerd/app/integration/Cargo.toml +++ b/linkerd/app/integration/Cargo.toml @@ -17,7 +17,7 @@ default = [] flakey = [] [dependencies] -bytes = "1" +bytes = { workspace = true } futures = { version = "0.3", default-features = false, features = ["executor"] } h2 = "0.3" http = { workspace = true } diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml index ba6c5a7cf..cfa7103d6 100644 --- a/linkerd/app/outbound/Cargo.toml +++ b/linkerd/app/outbound/Cargo.toml @@ -19,7 +19,7 @@ prometheus-client-rust-242 = [] # TODO [dependencies] ahash = "0.8" -bytes = "1" +bytes = { workspace = true } http = { workspace = true } futures = { version = "0.3", default-features = false } linkerd2-proxy-api = { workspace = true, features = ["outbound"] } diff --git a/linkerd/detect/Cargo.toml b/linkerd/detect/Cargo.toml index 4ca72b7e3..ce68f152b 100644 --- a/linkerd/detect/Cargo.toml +++ b/linkerd/detect/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] async-trait = "0.1" -bytes = "1" +bytes = { workspace = true } linkerd-error = { path = "../error" } linkerd-io = { path = "../io" } linkerd-stack = { path = "../stack" } diff --git a/linkerd/duplex/Cargo.toml b/linkerd/duplex/Cargo.toml index a0fe62f89..b2fc9ed01 100644 --- a/linkerd/duplex/Cargo.toml +++ b/linkerd/duplex/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" publish = false [dependencies] -bytes = "1" +bytes = { workspace = true } futures = { version = "0.3", default-features = false } tokio = { version = "1", features = ["io-util"] } pin-project = "1" diff --git a/linkerd/http/box/Cargo.toml b/linkerd/http/box/Cargo.toml index 4decfe41a..42d5ec6d5 100644 --- a/linkerd/http/box/Cargo.toml +++ b/linkerd/http/box/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" publish = false [dependencies] -bytes = "1" +bytes = { workspace = true } futures = { version = "0.3", default-features = false } http = { workspace = true } http-body = { workspace = true } diff --git a/linkerd/http/metrics/Cargo.toml b/linkerd/http/metrics/Cargo.toml index 92d68e538..02c1e87a8 100644 --- a/linkerd/http/metrics/Cargo.toml +++ b/linkerd/http/metrics/Cargo.toml @@ -10,7 +10,7 @@ publish = false test-util = [] [dependencies] -bytes = "1" +bytes = { workspace = true } futures = { version = "0.3", default-features = false } http = { workspace = true } http-body = { workspace = true } diff --git a/linkerd/http/prom/Cargo.toml b/linkerd/http/prom/Cargo.toml index baf89b72b..360ea1214 100644 --- a/linkerd/http/prom/Cargo.toml +++ b/linkerd/http/prom/Cargo.toml @@ -13,7 +13,7 @@ Tower middleware for Prometheus metrics. test-util = [] [dependencies] -bytes = "1" +bytes = { workspace = true } futures = { version = "0.3", default-features = false } http = { workspace = true } http-body = { workspace = true } diff --git a/linkerd/http/retry/Cargo.toml b/linkerd/http/retry/Cargo.toml index ba93bc987..a59da0d9a 100644 --- a/linkerd/http/retry/Cargo.toml +++ b/linkerd/http/retry/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" publish = false [dependencies] -bytes = "1" +bytes = { workspace = true } futures = { version = "0.3", default-features = false } http-body = { workspace = true } http = { workspace = true } diff --git a/linkerd/http/upgrade/Cargo.toml b/linkerd/http/upgrade/Cargo.toml index 5e609edf6..4cc5e01cc 100644 --- a/linkerd/http/upgrade/Cargo.toml +++ b/linkerd/http/upgrade/Cargo.toml @@ -10,7 +10,7 @@ Facilities for HTTP/1 upgrades. """ [dependencies] -bytes = "1" +bytes = { workspace = true } drain = "0.1" futures = { version = "0.3", default-features = false } http = { workspace = true } diff --git a/linkerd/io/Cargo.toml b/linkerd/io/Cargo.toml index b255f4078..0f68e6545 100644 --- a/linkerd/io/Cargo.toml +++ b/linkerd/io/Cargo.toml @@ -15,7 +15,7 @@ default = [] [dependencies] async-trait = "0.1" futures = { version = "0.3", default-features = false } -bytes = "1" +bytes = { workspace = true } linkerd-errno = { path = "../errno" } tokio = { version = "1", features = ["io-util", "net"] } tokio-test = { version = "0.4", optional = true } diff --git a/linkerd/proxy/http/Cargo.toml b/linkerd/proxy/http/Cargo.toml index 63874213c..cc1e1f3cc 100644 --- a/linkerd/proxy/http/Cargo.toml +++ b/linkerd/proxy/http/Cargo.toml @@ -13,7 +13,7 @@ This should probably be decomposed into smaller, decoupled crates. [dependencies] async-trait = "0.1" -bytes = "1" +bytes = { workspace = true } drain = "0.1" futures = { version = "0.3", default-features = false } h2 = "0.3" diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml index 658af97f8..b6d7d9d23 100644 --- a/linkerd/proxy/tap/Cargo.toml +++ b/linkerd/proxy/tap/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" publish = false [dependencies] -bytes = "1" +bytes = { workspace = true } http = { workspace = true } http-body = { workspace = true } hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] } diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml index 78cf4233b..8b0288ea8 100644 --- a/linkerd/service-profiles/Cargo.toml +++ b/linkerd/service-profiles/Cargo.toml @@ -10,7 +10,7 @@ Implements client layers for Linkerd ServiceProfiles. """ [dependencies] -bytes = "1" +bytes = { workspace = true } futures = { version = "0.3", default-features = false } http = { workspace = true } http-body = { workspace = true } diff --git a/linkerd/tls/Cargo.toml b/linkerd/tls/Cargo.toml index 7ae3a3694..6ee8a1121 100644 --- a/linkerd/tls/Cargo.toml +++ b/linkerd/tls/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] async-trait = "0.1" -bytes = "1" +bytes = { workspace = true } futures = { version = "0.3", default-features = false } linkerd-conditional = { path = "../conditional" } linkerd-dns-name = { path = "../dns/name" } diff --git a/linkerd/trace-context/Cargo.toml b/linkerd/trace-context/Cargo.toml index 92a42887b..06b6ebbc6 100644 --- a/linkerd/trace-context/Cargo.toml +++ b/linkerd/trace-context/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] base64 = "0.13" -bytes = "1" +bytes = { workspace = true } futures = { version = "0.3", default-features = false } hex = "0.4" http = { workspace = true } diff --git a/linkerd/transport-header/Cargo.toml b/linkerd/transport-header/Cargo.toml index 68779b0e6..e9a120986 100644 --- a/linkerd/transport-header/Cargo.toml +++ b/linkerd/transport-header/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] async-trait = "0.1" -bytes = "1" +bytes = { workspace = true } futures = { version = "0.3", default-features = false } linkerd-dns-name = { path = "../dns/name" } linkerd-error = { path = "../error" } diff --git a/opencensus-proto/Cargo.toml b/opencensus-proto/Cargo.toml index 7ba7f2d48..6813e2b7e 100644 --- a/opencensus-proto/Cargo.toml +++ b/opencensus-proto/Cargo.toml @@ -12,7 +12,7 @@ Vendored from https://github.com/census-instrumentation/opencensus-proto/. """ [dependencies] -bytes = "1" +bytes = { workspace = true } prost = { workspace = true } prost-types = { workspace = true } diff --git a/spiffe-proto/Cargo.toml b/spiffe-proto/Cargo.toml index 03405aece..a2e5cd104 100644 --- a/spiffe-proto/Cargo.toml +++ b/spiffe-proto/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" publish = false [dependencies] -bytes = "1" +bytes = { workspace = true } prost = { workspace = true } prost-types = { workspace = true }