diff --git a/Cargo.lock b/Cargo.lock index 913f52842aad8b..e7355b69b77ca5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1160,9 +1160,9 @@ name = "console-api" version = "0.1.0" source = "git+https://github.com/tokio-rs/console?rev=f2c30d52c9f22de69bac38009a9183135808806c#f2c30d52c9f22de69bac38009a9183135808806c" dependencies = [ - "prost", + "prost 0.8.0", "prost-types", - "tonic", + "tonic 0.5.2", "tonic-build", "tracing-core 0.1.21", ] @@ -1181,7 +1181,7 @@ dependencies = [ "thread_local", "tokio", "tokio-stream", - "tonic", + "tonic 0.5.2", "tracing 0.1.29", "tracing-core 0.1.21", "tracing-subscriber", @@ -2831,9 +2831,9 @@ dependencies = [ [[package]] name = "http-body" -version = "0.4.3" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "399c583b2979440c60be0821a6199eca73bc3c8dcd9d070d75ac726e2c6186e5" +checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" dependencies = [ "bytes 1.1.0", "http", @@ -4816,7 +4816,7 @@ dependencies = [ "indexmap", "nom 7.0.0", "num_enum", - "prost", + "prost 0.8.0", "prost-build", "prost-types", "shared", @@ -4862,7 +4862,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de5e2533f59d08fcf364fd374ebda0692a70bd6d7e66ef97f306f45c6c5d8020" dependencies = [ "bytes 1.1.0", - "prost-derive", + "prost-derive 0.8.0", +] + +[[package]] +name = "prost" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444879275cb4fd84958b1a1d5420d15e6fcf7c235fe47f053c9c2a80aceb6001" +dependencies = [ + "bytes 1.1.0", + "prost-derive 0.9.0", ] [[package]] @@ -4877,7 +4887,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prost", + "prost 0.8.0", "prost-types", "tempfile", "which 4.2.2", @@ -4896,6 +4906,19 @@ dependencies = [ "syn 1.0.76", ] +[[package]] +name = "prost-derive" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9cc1a3263e07e0bf68e96268f37665207b49560d98739662cdfaae215c720fe" +dependencies = [ + "anyhow", + "itertools", + "proc-macro2 1.0.29", + "quote 1.0.9", + "syn 1.0.76", +] + [[package]] name = "prost-types" version = "0.8.0" @@ -4903,7 +4926,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "603bbd6394701d13f3f25aada59c7de9d35a6a5887cfc156181234a44002771b" dependencies = [ "bytes 1.1.0", - "prost", + "prost 0.8.0", ] [[package]] @@ -4923,9 +4946,9 @@ dependencies = [ "native-tls", "nom 7.0.0", "pem", - "prost", + "prost 0.8.0", "prost-build", - "prost-derive", + "prost-derive 0.8.0", "rand 0.8.4", "regex", "tokio", @@ -6985,8 +7008,39 @@ dependencies = [ "hyper-timeout", "percent-encoding", "pin-project 1.0.8", - "prost", - "prost-derive", + "prost 0.8.0", + "prost-derive 0.8.0", + "tokio", + "tokio-stream", + "tokio-util", + "tower", + "tower-layer", + "tower-service", + "tracing 0.1.29", + "tracing-futures 0.2.5", +] + +[[package]] +name = "tonic" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f2aeb38f03d458a20b567d26716c0b6e4f27fc9bbc70c4e45933ef4037a0bc" +dependencies = [ + "async-stream", + "async-trait", + "base64 0.13.0", + "bytes 1.1.0", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-timeout", + "percent-encoding", + "pin-project 1.0.8", + "prost 0.9.0", + "prost-derive 0.9.0", "tokio", "tokio-rustls", "tokio-stream", @@ -7623,7 +7677,7 @@ dependencies = [ "postgres-openssl", "pretty_assertions", "prometheus-parser", - "prost", + "prost 0.8.0", "prost-build", "prost-types", "pulsar", @@ -7675,7 +7729,7 @@ dependencies = [ "tokio-test", "tokio-util", "toml", - "tonic", + "tonic 0.6.0", "tonic-build", "tower", "tower-layer", @@ -7765,7 +7819,7 @@ dependencies = [ "pin-project 1.0.8", "pretty_assertions", "proptest", - "prost", + "prost 0.8.0", "prost-build", "prost-types", "quickcheck", diff --git a/Cargo.toml b/Cargo.toml index 68772c8d0afb65..3fad6247ea43ab 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -279,7 +279,7 @@ url = { version = "2.2.2", default-features = false, features = ["serde"] } uuid = { version = "0.8.2", default-features = false, features = ["serde", "v4"], optional = true } warp = { version = "0.3.1", default-features = false, optional = true } zstd = { version = "0.6", default-features = false, optional = true } -tonic = { version = "0.5", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls"] } +tonic = { version = "0.6", optional = true, default-features = false, features = ["transport", "codegen", "prost", "tls"] } data-encoding = { version = "2.2", default-features = false, features = ["std"], optional = true } trust-dns-proto = { version = "0.20", features = ["dnssec"], optional = true }