From 5a80b98c0488018015b025b895bde0c715f1601e Mon Sep 17 00:00:00 2001 From: ad hoc Date: Fri, 15 Sep 2023 17:15:33 +0200 Subject: [PATCH] bump tonic/prost dependencies and MSRV to 1.64 (#464) * (chore): bump tonic and prost dependencies * (chore): bump MSRV to 1.64.0 --- .github/workflows/ci.yaml | 4 +- Cargo.lock | 181 +++++++++++------- console-api/Cargo.toml | 14 +- .../generated/rs.tokio.console.async_ops.rs | 2 +- .../src/generated/rs.tokio.console.common.rs | 4 +- .../generated/rs.tokio.console.instrument.rs | 42 ++-- .../generated/rs.tokio.console.resources.rs | 2 +- .../src/generated/rs.tokio.console.tasks.rs | 2 +- .../src/generated/rs.tokio.console.trace.rs | 12 +- console-subscriber/Cargo.toml | 8 +- tokio-console/Cargo.toml | 6 +- xtask/Cargo.toml | 6 +- 12 files changed, 165 insertions(+), 118 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index d0c01f7f1..59f697eb0 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -51,8 +51,8 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] rust: [stable] include: - # Make 1.60 MSRV, as it's Tonic 0.9's MSRV. - - rust: 1.60.0 + # Make 1.64 MSRV, as it's Tonic 0.10's MSRV. + - rust: 1.64.0 os: ubuntu-latest # Try to build on the latest nightly. This job is allowed to fail, but # it's useful to help catch bugs in upcoming Rust versions. diff --git a/Cargo.lock b/Cargo.lock index e78a52f1a..49e4a3ed4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,27 +19,40 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.12.1" +name = "anyhow" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" + +[[package]] +name = "async-stream" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cd56dd203fef61ac097dd65721a419ddccb106b2d2b70ba60a6b529f03961a51" dependencies = [ - "winapi", + "async-stream-impl", + "futures-core", + "pin-project-lite", ] [[package]] -name = "anyhow" -version = "1.0.56" +name = "async-stream-impl" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "16e62a023e7c117e27523144c5d2459f4397fcc3cab0085af8e2224f643a0193" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.33", +] [[package]] name = "async-trait" @@ -49,7 +62,7 @@ checksum = "b9ccdd8f2a161be9bd5c023df56f1b2a0bd1d83872ae53b71a84a12c9bf6e842" dependencies = [ "proc-macro2", "quote", - "syn 2.0.15", + "syn 2.0.33", ] [[package]] @@ -735,12 +748,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.16" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6389c490849ff5bc16be905ae24bc913a9c8892e19b2341dbc175e14c341c2b8" -dependencies = [ - "cfg-if", -] +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" [[package]] name = "matchers" @@ -748,7 +758,7 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" dependencies = [ - "regex-automata", + "regex-automata 0.1.10", ] [[package]] @@ -765,9 +775,9 @@ checksum = "b87248edafb776e59e6ee64a79086f65890d3510f2c656c000bf2a7e8a0aea40" [[package]] name = "memchr" -version = "2.4.1" +version = "2.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" [[package]] name = "mime" @@ -819,6 +829,16 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi", +] + [[package]] name = "num-traits" version = "0.2.14" @@ -859,6 +879,12 @@ version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + [[package]] name = "owo-colors" version = "3.5.0" @@ -867,9 +893,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f" [[package]] name = "parking_lot" -version = "0.12.0" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f5ec2493a61ac0506c0f4199f99070cbe83857b0337006a30f3e6719b8ef58" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" dependencies = [ "lock_api", "parking_lot_core", @@ -926,9 +952,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.8" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e280fbe77cc62c91527259e9442153f4688736748d24660126286329742b4c6c" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -944,12 +970,12 @@ checksum = "eb9f9e6e233e5c4a35559a617bf40a4ec447db2e84c20b55a6f83167b7e57872" [[package]] name = "prettyplease" -version = "0.1.9" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b83ec2d0af5c5c556257ff52c9f98934e243b9fd39604bfb2a9b75ec2e97f18" +checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d" dependencies = [ "proc-macro2", - "syn 1.0.90", + "syn 2.0.33", ] [[package]] @@ -978,18 +1004,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.63" +version = "1.0.67" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b368fba921b0dce7e60f5e04ec15e565b3303972b42bcfde1d0713b881959eb" +checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328" dependencies = [ "unicode-ident", ] [[package]] name = "prost" -version = "0.11.9" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd" +checksum = "aa8473a65b88506c106c28ae905ca4a2b83a2993640467a41bb3080627ddfd2c" dependencies = [ "bytes", "prost-derive", @@ -997,53 +1023,53 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.11.9" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270" +checksum = "30d3e647e9eb04ddfef78dfee2d5b3fefdf94821c84b710a3d8ebc89ede8b164" dependencies = [ "bytes", "heck", "itertools", - "lazy_static", "log", "multimap", + "once_cell", "petgraph", "prettyplease", "prost", "prost-types", "regex", - "syn 1.0.90", + "syn 2.0.33", "tempfile", "which", ] [[package]] name = "prost-derive" -version = "0.11.9" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4" +checksum = "56075c27b20ae524d00f247b8a4dc333e5784f889fe63099f8e626bc8d73486c" dependencies = [ "anyhow", "itertools", "proc-macro2", "quote", - "syn 1.0.90", + "syn 2.0.33", ] [[package]] name = "prost-types" -version = "0.11.9" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13" +checksum = "cebe0a918c97f86c217b0f76fd754e966f8b9f41595095cf7d74cb4e59d730f6" dependencies = [ "prost", ] [[package]] name = "quote" -version = "1.0.27" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4f29d145265ec1c483c7c654450edde0bfe043d3938d6972630663356d9500" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ "proc-macro2", ] @@ -1113,13 +1139,14 @@ dependencies = [ [[package]] name = "regex" -version = "1.5.5" +version = "1.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" +checksum = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-automata 0.3.8", + "regex-syntax 0.7.5", ] [[package]] @@ -1128,7 +1155,18 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" dependencies = [ - "regex-syntax", + "regex-syntax 0.6.25", +] + +[[package]] +name = "regex-automata" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax 0.7.5", ] [[package]] @@ -1137,6 +1175,12 @@ version = "0.6.25" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +[[package]] +name = "regex-syntax" +version = "0.7.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" + [[package]] name = "remove_dir_all" version = "0.5.3" @@ -1248,9 +1292,9 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32" [[package]] name = "smallvec" -version = "1.8.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" +checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "socket2" @@ -1281,9 +1325,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.15" +version = "2.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a34fcf3e8b60f57e6a14301a2e916d323af98b0ea63c599441eec8558660c822" +checksum = "9caece70c63bfba29ec2fed841a09851b14a235c60010fa4de58089b6c025668" dependencies = [ "proc-macro2", "quote", @@ -1477,16 +1521,15 @@ dependencies = [ [[package]] name = "tonic" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3082666a3a6433f7f511c7192923fa1fe07c69332d3c6a2e6bb040b569199d5a" +checksum = "5469afaf78a11265c343a88969045c1568aa8ecc6c787dbf756e92e70f199861" dependencies = [ + "async-stream", "async-trait", "axum", "base64 0.21.0", "bytes", - "futures-core", - "futures-util", "h2", "http", "http-body", @@ -1505,15 +1548,15 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.9.2" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6fdaae4c2c638bb70fe42803a26fbd6fc6ac8c72f5c59f67ecc2a2dcabf4b07" +checksum = "8b477abbe1d18c0b08f56cd01d1bc288668c5b5cfd19b2ae1886bbf599c546f1" dependencies = [ "prettyplease", "proc-macro2", "prost-build", "quote", - "syn 1.0.90", + "syn 2.0.33", ] [[package]] @@ -1550,9 +1593,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" [[package]] name = "tracing" -version = "0.1.32" +version = "0.1.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1bdf54a7c28a2bbf701e1d2233f6c77f473486b94bee4f9678da5a148dca7f" +checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8" dependencies = [ "cfg-if", "log", @@ -1563,22 +1606,22 @@ dependencies = [ [[package]] name = "tracing-attributes" -version = "0.1.20" +version = "0.1.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e65ce065b4b5c53e73bb28912318cb8c9e9ad3921f1d669eb0e68b4c8143a2b" +checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab" dependencies = [ "proc-macro2", "quote", - "syn 1.0.90", + "syn 2.0.33", ] [[package]] name = "tracing-core" -version = "0.1.24" +version = "0.1.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90442985ee2f57c9e1b548ee72ae842f4a9a20e3f417cc38dbc5dc684d9bb4ee" +checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a" dependencies = [ - "lazy_static", + "once_cell", "valuable", ] @@ -1605,9 +1648,9 @@ dependencies = [ [[package]] name = "tracing-log" -version = "0.1.2" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6923477a48e41c1951f1999ef8bb5a3023eb723ceadafe78ffb65dc366761e3" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" dependencies = [ "lazy_static", "log", @@ -1616,13 +1659,13 @@ dependencies = [ [[package]] name = "tracing-subscriber" -version = "0.3.11" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bc28f93baff38037f64e6f43d34cfa1605f27a49c34e8a04c5e78b0babf2596" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" dependencies = [ - "ansi_term", - "lazy_static", "matchers", + "nu-ansi-term", + "once_cell", "parking_lot", "regex", "sharded-slab", diff --git a/console-api/Cargo.toml b/console-api/Cargo.toml index 1623854fd..d1d584431 100644 --- a/console-api/Cargo.toml +++ b/console-api/Cargo.toml @@ -3,7 +3,7 @@ name = "console-api" version = "0.5.0" license = "MIT" edition = "2021" -rust-version = "1.60.0" +rust-version = "1.64.0" authors = ["Eliza Weisman ", "Tokio Contributors ",] readme = "README.md" repository = "https://github.com/tokio-rs/console/" @@ -29,23 +29,23 @@ keywords = [ transport = ["tonic/transport"] [dependencies] -tonic = { version = "0.9", default-features = false, features = [ +tonic = { version = "0.10", default-features = false, features = [ "prost", "codegen", "transport", ] } -prost = "0.11" -prost-types = "0.11" +prost = "0.12" +prost-types = "0.12" tracing-core = "0.1.17" futures-core = "0.3" [dev-dependencies] -tonic-build = { version = "0.9", default-features = false, features = [ +tonic-build = { version = "0.10", default-features = false, features = [ "prost", "transport" ] } # explicit dep so we can get the version with fixed whitespace. -prost-build = "0.11.1" +prost-build = "0.12.0" [package.metadata.docs.rs] all-features = true -rustdoc-args = ["--cfg", "docsrs"] \ No newline at end of file +rustdoc-args = ["--cfg", "docsrs"] diff --git a/console-api/src/generated/rs.tokio.console.async_ops.rs b/console-api/src/generated/rs.tokio.console.async_ops.rs index bbdf909ca..95d30b473 100644 --- a/console-api/src/generated/rs.tokio.console.async_ops.rs +++ b/console-api/src/generated/rs.tokio.console.async_ops.rs @@ -1,4 +1,4 @@ -/// An `AsyncOp` state update. +/// An `AsyncOp` state update. /// /// This includes a list of any new async ops, and updates to the associated statistics /// for any async ops that have changed since the last update. diff --git a/console-api/src/generated/rs.tokio.console.common.rs b/console-api/src/generated/rs.tokio.console.common.rs index 478de279e..2dd4542de 100644 --- a/console-api/src/generated/rs.tokio.console.common.rs +++ b/console-api/src/generated/rs.tokio.console.common.rs @@ -48,7 +48,7 @@ pub struct Field { pub metadata_id: ::core::option::Option, /// The key of the key-value pair. /// - /// This is either represented as a string, or as an index into a `Metadata`'s + /// This is either represented as a string, or as an index into a `Metadata`'s /// array of field name strings. #[prost(oneof = "field::Name", tags = "1, 2")] pub name: ::core::option::Option, @@ -60,7 +60,7 @@ pub struct Field { pub mod field { /// The key of the key-value pair. /// - /// This is either represented as a string, or as an index into a `Metadata`'s + /// This is either represented as a string, or as an index into a `Metadata`'s /// array of field name strings. #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] diff --git a/console-api/src/generated/rs.tokio.console.instrument.rs b/console-api/src/generated/rs.tokio.console.instrument.rs index bfc9d0f05..978f994fa 100644 --- a/console-api/src/generated/rs.tokio.console.instrument.rs +++ b/console-api/src/generated/rs.tokio.console.instrument.rs @@ -153,9 +153,9 @@ pub mod instrument_client { &mut self, request: impl tonic::IntoRequest, ) -> std::result::Result< - tonic::Response>, - tonic::Status, - > { + tonic::Response>, + tonic::Status, + > { self.inner .ready() .await @@ -184,11 +184,9 @@ pub mod instrument_client { &mut self, request: impl tonic::IntoRequest, ) -> std::result::Result< - tonic::Response< - tonic::codec::Streaming, - >, - tonic::Status, - > { + tonic::Response>, + tonic::Status, + > { self.inner .ready() .await @@ -272,7 +270,7 @@ pub mod instrument_server { #[async_trait] pub trait Instrument: Send + Sync + 'static { /// Server streaming response type for the WatchUpdates method. - type WatchUpdatesStream: futures_core::Stream< + type WatchUpdatesStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result, > + Send @@ -282,11 +280,11 @@ pub mod instrument_server { &self, request: tonic::Request, ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; + tonic::Response, + tonic::Status, + >; /// Server streaming response type for the WatchTaskDetails method. - type WatchTaskDetailsStream: futures_core::Stream< + type WatchTaskDetailsStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result< super::super::tasks::TaskDetails, tonic::Status, @@ -299,9 +297,9 @@ pub mod instrument_server { &self, request: tonic::Request, ) -> std::result::Result< - tonic::Response, - tonic::Status, - >; + tonic::Response, + tonic::Status, + >; /// Registers that the console observer wants to pause the stream. async fn pause( &self, @@ -412,7 +410,7 @@ pub mod instrument_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).watch_updates(request).await + ::watch_updates(&inner, request).await }; Box::pin(fut) } @@ -459,7 +457,7 @@ pub mod instrument_server { ) -> Self::Future { let inner = Arc::clone(&self.0); let fut = async move { - (*inner).watch_task_details(request).await + ::watch_task_details(&inner, request).await }; Box::pin(fut) } @@ -502,7 +500,9 @@ pub mod instrument_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).pause(request).await }; + let fut = async move { + ::pause(&inner, request).await + }; Box::pin(fut) } } @@ -544,7 +544,9 @@ pub mod instrument_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).resume(request).await }; + let fut = async move { + ::resume(&inner, request).await + }; Box::pin(fut) } } diff --git a/console-api/src/generated/rs.tokio.console.resources.rs b/console-api/src/generated/rs.tokio.console.resources.rs index 2ee3ba497..d9edd03f7 100644 --- a/console-api/src/generated/rs.tokio.console.resources.rs +++ b/console-api/src/generated/rs.tokio.console.resources.rs @@ -59,7 +59,7 @@ pub struct Resource { pub parent_resource_id: ::core::option::Option, /// Is the resource an internal component of another resource? /// - /// For example, a `tokio::time::Interval` resource might contain a + /// For example, a `tokio::time::Interval` resource might contain a /// `tokio::time::Sleep` resource internally. #[prost(bool, tag = "7")] pub is_internal: bool, diff --git a/console-api/src/generated/rs.tokio.console.tasks.rs b/console-api/src/generated/rs.tokio.console.tasks.rs index be5ac1b1a..41b839681 100644 --- a/console-api/src/generated/rs.tokio.console.tasks.rs +++ b/console-api/src/generated/rs.tokio.console.tasks.rs @@ -203,7 +203,7 @@ pub struct Stats { /// reflect any scheduled state where the task hasn't yet been polled. /// Subtracting both `busy_time` (from the task's `PollStats`) and /// `scheduled_time` from the total lifetime of the task results in the - /// amount of time it spent unable to progress because it was waiting on + /// amount of time it spent unable to progress because it was waiting on /// some resource. #[prost(message, optional, tag = "9")] pub scheduled_time: ::core::option::Option<::prost_types::Duration>, diff --git a/console-api/src/generated/rs.tokio.console.trace.rs b/console-api/src/generated/rs.tokio.console.trace.rs index b15967baf..220b55ab6 100644 --- a/console-api/src/generated/rs.tokio.console.trace.rs +++ b/console-api/src/generated/rs.tokio.console.trace.rs @@ -178,9 +178,9 @@ pub mod trace_client { &mut self, request: impl tonic::IntoRequest, ) -> std::result::Result< - tonic::Response>, - tonic::Status, - > { + tonic::Response>, + tonic::Status, + > { self.inner .ready() .await @@ -209,7 +209,7 @@ pub mod trace_server { #[async_trait] pub trait Trace: Send + Sync + 'static { /// Server streaming response type for the Watch method. - type WatchStream: futures_core::Stream< + type WatchStream: tonic::codegen::tokio_stream::Stream< Item = std::result::Result, > + Send @@ -318,7 +318,9 @@ pub mod trace_server { request: tonic::Request, ) -> Self::Future { let inner = Arc::clone(&self.0); - let fut = async move { (*inner).watch(request).await }; + let fut = async move { + ::watch(&inner, request).await + }; Box::pin(fut) } } diff --git a/console-subscriber/Cargo.toml b/console-subscriber/Cargo.toml index 1bfb60e24..4e9e4e10c 100644 --- a/console-subscriber/Cargo.toml +++ b/console-subscriber/Cargo.toml @@ -3,7 +3,7 @@ name = "console-subscriber" version = "0.1.10" license = "MIT" edition = "2021" -rust-version = "1.60.0" +rust-version = "1.64.0" authors = ["Eliza Weisman ", "Tokio Contributors ",] readme = "README.md" repository = "https://github.com/tokio-rs/console/" @@ -36,17 +36,17 @@ tokio = { version = "^1.21", features = ["sync", "time", "macros", "tracing"] } tokio-stream = { version = "0.1", features = ["net"] } thread_local = "1.1.3" console-api = { version = "0.5.0", path = "../console-api", features = ["transport"] } -tonic = { version = "0.9", features = ["transport"] } +tonic = { version = "0.10", features = ["transport"] } tracing-core = "0.1.24" tracing = "0.1.26" -tracing-subscriber = { version = "0.3.11", default-features = false, features = ["fmt", "registry"] } +tracing-subscriber = { version = "0.3.17", default-features = false, features = ["fmt", "registry"] } futures-task = { version = "0.3", default-features = false } hdrhistogram = { version = "7.3.0", default-features = false, features = ["serialization"] } # The parking_lot dependency is renamed, because we want our `parking_lot` # feature to also enable `tracing-subscriber`'s parking_lot feature flag. parking_lot_crate = { package = "parking_lot", version = "0.12", optional = true } humantime = "2.1.0" -prost-types = "0.11.0" +prost-types = "0.12.0" # Required for recording: serde = { version = "1", features = ["derive"] } diff --git a/tokio-console/Cargo.toml b/tokio-console/Cargo.toml index 52ec6b11a..89405ae9d 100644 --- a/tokio-console/Cargo.toml +++ b/tokio-console/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.9" license = "MIT" repository = "https://github.com/tokio-rs/console" edition = "2021" -rust-version = "1.60.0" +rust-version = "1.64.0" authors = ["Eliza Weisman ", "Tokio Contributors ",] readme = "README.md" default-run = "tokio-console" @@ -31,14 +31,14 @@ atty = "0.2" console-api = { version = "0.5.0", path = "../console-api", features = ["transport"] } clap = { version = "3", features = ["cargo", "derive", "env"] } tokio = { version = "1", features = ["full", "rt-multi-thread"] } -tonic = { version = "0.9", features = ["transport"] } +tonic = { version = "0.10", features = ["transport"] } futures = "0.3" ratatui = { version = "0.20.1", default-features = false, features = ["crossterm"] } tower = "0.4.12" tracing = "0.1" tracing-subscriber = { version = "0.3.0", features = ["env-filter"] } tracing-journald = { version = "0.2", optional = true } -prost-types = "0.11" +prost-types = "0.12" crossterm = { version = "0.26.1", features = ["event-stream"] } color-eyre = { version = "0.6", features = ["issue-url"] } hdrhistogram = { version = "7.3.0", default-features = false, features = ["serialization"] } diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 260861f2e..78f64606f 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -3,12 +3,12 @@ name = "xtask" version = "0.1.0" license = "MIT" edition = "2021" -rust-version = "1.60.0" +rust-version = "1.64.0" publish = false [dependencies] -tonic-build = { version = "0.9", default-features = false, features = [ +tonic-build = { version = "0.10", default-features = false, features = [ "prost", "transport" ] } clap = { version = "3", features = ["derive"] } -color-eyre = "0.6" \ No newline at end of file +color-eyre = "0.6"