Skip to content

Commit

Permalink
chore(cargo.toml): define bytes as a workspace dependency
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
cratelyn committed Dec 19, 2024
1 parent 417e39c commit 6ce6c43
Show file tree
Hide file tree
Showing 22 changed files with 22 additions and 21 deletions.
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/admin/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/inbound/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/integration/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/app/outbound/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/detect/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/duplex/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/box/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/metrics/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/prom/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/retry/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/http/upgrade/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/io/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/http/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion linkerd/proxy/tap/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/service-profiles/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/tls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/trace-context/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion linkerd/transport-header/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand Down
2 changes: 1 addition & 1 deletion opencensus-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }

Expand Down
2 changes: 1 addition & 1 deletion spiffe-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ edition = "2021"
publish = false

[dependencies]
bytes = "1"
bytes = { workspace = true }
prost = { workspace = true }
prost-types = { workspace = true }

Expand Down

0 comments on commit 6ce6c43

Please sign in to comment.