Skip to content

Commit ebbdb0b

Browse files
authored
chore(deps): upgrade tonic to 0.14 (#1049)
1 parent 3ee4277 commit ebbdb0b

File tree

9 files changed

+98
-61
lines changed

9 files changed

+98
-61
lines changed

Cargo.lock

Lines changed: 73 additions & 42 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ paste = { version = "1", default-features = false }
103103
pin-project = { version = "1.1", default-features = false }
104104
pin-project-lite = { version = "0.2", default-features = false }
105105
proptest = { version = "1.7", default-features = false, features = ["std"] }
106-
prost = { version = "0.13", default-features = false }
106+
prost = { version = "0.14", default-features = false }
107107
quanta = { version = "0.12", default-features = false }
108108
rand = { version = "0.9", default-features = false }
109109
rand_distr = { version = "0.5", default-features = false }
@@ -125,12 +125,13 @@ ndarray-stats = { version = "0.6", default-features = false }
125125
noisy_float = { version = "0.2", default-features = false }
126126
libc = { version = "0.2.169", default-features = false }
127127
socket2 = { version = "0.6", default-features = false }
128-
tonic-build = { version = "0.13", default-features = false }
129-
tonic = { version = "0.13", default-features = false }
128+
tonic-prost-build = { version = "0.14", default-features = false }
129+
tonic-prost = { version = "0.14", default-features = false }
130+
tonic = { version = "0.14", default-features = false }
130131
arc-swap = { version = "1.7.1", default-features = false }
131132
async-stream = { version = "0.3.5", default-features = false }
132133
futures = { version = "0.3.30", default-features = false }
133-
prost-types = { version = "0.13", default-features = false }
134+
prost-types = { version = "0.14", default-features = false }
134135
serde_json = { version = "1.0.138", default-features = false, features = [
135136
"std",
136137
] }
@@ -165,7 +166,7 @@ float-cmp = { version = "0.10", default-features = false }
165166
tower-http = { version = "0.6", default-features = false }
166167
bollard = { version = "0.18", default-features = false }
167168
reqwest = { version = "0.12.12", default-features = false }
168-
lading-payload = { git = "https://github.com/DataDog/lading", rev = "268a16aefaea2d8de193a6442cc3f33e0538f152" }
169+
lading-payload = { git = "https://github.com/DataDog/lading", tag = "v0.30.0" }
169170
serde_yaml = { version = "0.9", default-features = false }
170171
serde_with = { version = "3.12.0", default-features = false, features = [
171172
"macros",

LICENSE-3rdparty.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ clap_builder,https://github.com/clap-rs/clap,MIT OR Apache-2.0,The clap_builder
4545
clap_lex,https://github.com/clap-rs/clap,MIT OR Apache-2.0,The clap_lex Authors
4646
colored,https://github.com/mackwic/colored,MPL-2.0,Thomas Wickham <mackwic@gmail.com>
4747
comfy-table,https://github.com/nukesor/comfy-table,MIT,Arne Beer <contact@arne.beer>
48+
const-hex,https://github.com/danipopes/const-hex,MIT OR Apache-2.0,DaniPopes <57450786+DaniPopes@users.noreply.github.com>
4849
core-foundation,https://github.com/servo/core-foundation-rs,MIT OR Apache-2.0,The Servo Project Developers
4950
cpufeatures,https://github.com/RustCrypto/utils,MIT OR Apache-2.0,RustCrypto Developers
5051
crc32fast,https://github.com/srijs/rust-crc32fast,MIT OR Apache-2.0,"Sam Rijs <srijs@airpost.net>, Alex Crichton <alex@alexcrichton.com>"
@@ -187,6 +188,7 @@ ppv-lite86,https://github.com/cryptocorrosion/cryptocorrosion,MIT OR Apache-2.0,
187188
prettyplease,https://github.com/dtolnay/prettyplease,MIT OR Apache-2.0,David Tolnay <dtolnay@gmail.com>
188189
proc-macro2,https://github.com/dtolnay/proc-macro2,MIT OR Apache-2.0,"David Tolnay <dtolnay@gmail.com>, Alex Crichton <alex@alexcrichton.com>"
189190
proc-macro2-diagnostics,https://github.com/SergioBenitez/proc-macro2-diagnostics,MIT OR Apache-2.0,Sergio Benitez <sb@sergio.bz>
191+
proptest,https://github.com/proptest-rs/proptest,MIT OR Apache-2.0,Jason Lingle
190192
prost,https://github.com/tokio-rs/prost,Apache-2.0,"Dan Burkert <dan@danburkert.com>, Lucio Franco <luciofranco14@gmail.com>, Casper Meijn <casper@meijn.net>, Tokio Contributors <team@tokio.rs>"
191193
protobuf,https://github.com/stepancheg/rust-protobuf,MIT,Stepan Koltsov <stepan.koltsov@gmail.com>
192194
protobuf-parse,https://github.com/stepancheg/rust-protobuf/tree/master/protobuf-parse,MIT,Stepan Koltsov <stepan.koltsov@gmail.com>

lib/protos/containerd/Cargo.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ workspace = true
1212
bytes = { workspace = true }
1313
prost = { workspace = true, features = ["derive", "std"] }
1414
prost-types = { workspace = true }
15-
tonic = { workspace = true, features = ["codegen", "prost"] }
15+
tonic = { workspace = true, features = ["codegen"] }
16+
tonic-prost = { workspace = true }
1617

1718
[build-dependencies]
18-
tonic-build = { workspace = true, features = ["prost"] }
19+
tonic-prost-build = { workspace = true }
1920

2021
# All our dependencies are used in the generated code, which `cargo-machete` can't see into, so we
2122
# ignore them explicitly to avoid false positives.
2223
[package.metadata.cargo-machete]
23-
ignored = ["bytes", "prost", "prost-types", "tonic"]
24+
ignored = ["bytes", "prost", "prost-types", "tonic", "tonic-prost"]

lib/protos/containerd/build.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@ fn main() {
3939
println!("cargo:rerun-if-changed=build.rs");
4040

4141
// Handle code generation for gRPC service definitions.
42-
let mut config = tonic_build::Config::new();
42+
let mut config = tonic_prost_build::Config::new();
4343
config.enable_type_names();
4444

45-
tonic_build::configure()
45+
tonic_prost_build::configure()
4646
.build_server(false)
4747
.include_file("containerd.mod.rs")
48-
.compile_protos_with_config(config, CONTAINERD_PROTO_FILES, &["proto/"])
48+
.compile_with_config(config, CONTAINERD_PROTO_FILES, &["proto/"])
4949
.expect("failed to build gRPC service definitions for containerd");
5050

5151
if let Err(e) = fixup_bad_doc_comments() {

0 commit comments

Comments
 (0)