From 64c9cfa3e53735a31ec3b713991c89071ad4e462 Mon Sep 17 00:00:00 2001 From: Josh McKinney Date: Tue, 6 Feb 2024 10:05:10 -0800 Subject: [PATCH] chore: bump msrv to 1.70 --- .github/workflows/ci.yaml | 3 +- Cargo.lock | 245 +++++++++++++++--------------- README.md | 14 +- console-api/Cargo.toml | 2 +- console-api/README.md | 4 +- console-subscriber/Cargo.toml | 2 +- console-subscriber/README.md | 20 ++- tokio-console/Cargo.toml | 10 +- tokio-console/README.md | 15 +- tokio-console/tests/cli-ui.stdout | 14 +- xtask/Cargo.toml | 8 +- 11 files changed, 166 insertions(+), 171 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 3f7c3a7ce..8aa9a36ca 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -51,8 +51,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] rust: [stable] include: - # Make 1.64 MSRV, as it's Tonic 0.10's MSRV. - - rust: 1.64.0 + - rust: 1.70.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 f3abfcd02..d35f6408e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -44,6 +44,54 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" +[[package]] +name = "anstream" +version = "0.6.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc" + +[[package]] +name = "anstyle-parse" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +dependencies = [ + "windows-sys 0.52.0", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +dependencies = [ + "anstyle", + "windows-sys 0.52.0", +] + [[package]] name = "anyhow" version = "1.0.79" @@ -222,44 +270,41 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.1.14" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "906f7fe1da4185b7a282b2bc90172a496f9def1aca4545fe7526810741591e14" +checksum = "80c21025abd42669a92efc996ef13cfb2c5c627858421ea58d5c3b331a6c134f" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.1.14" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351f9ad9688141ed83dfd8f5fb998a06225ef444b48ff4dc43de6d409b7fd10b" +checksum = "458bf1f341769dfcf849846f65dffdf9146daa56bcd2a47cb4e1de9915567c99" dependencies = [ - "bitflags 1.3.2", + "anstream", + "anstyle", "clap_lex", - "is-terminal", - "once_cell", "strsim", - "termcolor", "terminal_size", ] [[package]] name = "clap_complete" -version = "4.1.6" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d3120a421cd111c43f1a6c7d0dd83bb6aaa0659c164468a1654014632a5ec6" +checksum = "299353be8209bd133b049bf1c63582d184a8b39fd9c04f15fe65f50f88bdfe6c" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.1.14" +version = "4.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d7dc0031c3a59a04fc2ba395c8e2dd463cba1859275f065d225f6122221b45" +checksum = "307bc0538d5f0f83b8248db3087aa92fe504e4691294d0c96c0eabc33f47ba47" dependencies = [ "heck", "proc-macro2", @@ -269,9 +314,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce" [[package]] name = "color-eyre" @@ -302,14 +347,10 @@ dependencies = [ ] [[package]] -name = "combine" -version = "4.6.6" +name = "colorchoice" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] +checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" [[package]] name = "compact_str" @@ -324,23 +365,6 @@ dependencies = [ "static_assertions", ] -[[package]] -name = "concolor" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015267563b1df20adccdd00cb05257b1dfbea70a04928e9cf88ffb850c1a40af" -dependencies = [ - "atty", - "bitflags 1.3.2", - "concolor-query", -] - -[[package]] -name = "concolor-query" -version = "0.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6417fe6fc03a8b533fd2177742eeb39a90c7233eedec7bac96d4d6b69a09449" - [[package]] name = "console-api" version = "0.6.0" @@ -893,37 +917,6 @@ version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" -[[package]] -name = "io-lifetimes" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2" -dependencies = [ - "hermit-abi 0.3.6", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b" -dependencies = [ - "hermit-abi 0.3.6", - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "itertools" -version = "0.10.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.11.0" @@ -971,12 +964,6 @@ dependencies = [ "redox_syscall", ] -[[package]] -name = "linux-raw-sys" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519" - [[package]] name = "linux-raw-sys" version = "0.4.13" @@ -1461,20 +1448,6 @@ version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" -[[package]] -name = "rustix" -version = "0.37.27" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2" -dependencies = [ - "bitflags 1.3.2", - "errno", - "io-lifetimes", - "libc", - "linux-raw-sys 0.3.8", - "windows-sys 0.48.0", -] - [[package]] name = "rustix" version = "0.38.31" @@ -1484,7 +1457,7 @@ dependencies = [ "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys 0.4.13", + "linux-raw-sys", "windows-sys 0.52.0", ] @@ -1546,6 +1519,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "sharded-slab" version = "0.1.7" @@ -1614,14 +1596,16 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "snapbox" -version = "0.3.3" +version = "0.4.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d199ccf8f606592df2d145db26f2aa45344e23c64b074cc5a4047f1d99b0f7" +checksum = "4b831b6e80fbcd2889efa75b185d24005f85981431495f995292b25836519d84" dependencies = [ - "concolor", + "anstream", + "anstyle", "content_inspector", "dunce", "filetime", + "libc", "normalize-line-endings", "os_pipe", "similar", @@ -1629,7 +1613,7 @@ dependencies = [ "tempfile", "wait-timeout", "walkdir", - "yansi", + "windows-sys 0.52.0", ] [[package]] @@ -1637,6 +1621,9 @@ name = "snapbox-macros" version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e1c4b838b05d15ab22754068cb73500b2f3b07bf09d310e15b27f88160f1de40" +dependencies = [ + "anstream", +] [[package]] name = "socket2" @@ -1666,9 +1653,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" [[package]] name = "strsim" -version = "0.10.0" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +checksum = "5ee073c9e4cd00e28217186dbe12796d692868f432bf2e97ee73bed0c56dfa01" [[package]] name = "strum" @@ -1728,26 +1715,17 @@ checksum = "a365e8cd18e44762ef95d87f284f4b5cd04107fec2ff3052bd6a3e6069669e67" dependencies = [ "cfg-if", "fastrand", - "rustix 0.38.31", + "rustix", "windows-sys 0.52.0", ] -[[package]] -name = "termcolor" -version = "1.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" -dependencies = [ - "winapi-util", -] - [[package]] name = "terminal_size" -version = "0.2.6" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237" +checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" dependencies = [ - "rustix 0.37.27", + "rustix", "windows-sys 0.48.0", ] @@ -1901,16 +1879,26 @@ dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + [[package]] name = "toml_edit" -version = "0.14.4" +version = "0.22.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f" +checksum = "99e68c159e8f5ba8a28c4eb7b0c0c190d77bb479047ca713270048145a9ad28a" dependencies = [ - "combine", - "indexmap 1.9.3", - "itertools 0.10.5", + "indexmap 2.2.3", "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -2115,9 +2103,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] name = "trycmd" -version = "0.13.6" +version = "0.14.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac9fa73959e252e7c5a4e6260544b952f5bf3989e0b7ad229f4fd6f14671b02" +checksum = "d41014f614932fff67cd3b780e0eb0ecb14e698a831a0e555ef2a5137be968d5" dependencies = [ "glob", "humantime", @@ -2173,6 +2161,12 @@ dependencies = [ "percent-encoding", ] +[[package]] +name = "utf8parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" + [[package]] name = "valuable" version = "0.1.0" @@ -2228,7 +2222,7 @@ dependencies = [ "either", "home", "once_cell", - "rustix 0.38.31", + "rustix", ] [[package]] @@ -2394,6 +2388,15 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +[[package]] +name = "winnow" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d90f4e0f530c4c69f62b80d839e9ef3855edc9cba471a160c4d692deed62b401" +dependencies = [ + "memchr", +] + [[package]] name = "xtask" version = "0.1.0" @@ -2403,12 +2406,6 @@ dependencies = [ "tonic-build", ] -[[package]] -name = "yansi" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec" - [[package]] name = "zerocopy" version = "0.7.32" diff --git a/README.md b/README.md index fe3f3d945..46255cdae 100644 --- a/README.md +++ b/README.md @@ -174,14 +174,12 @@ The Tokio console: a debugger for async Rust. Usage: tokio-console[EXE] [OPTIONS] [TARGET_ADDR] [COMMAND] Commands: - gen-config - Generate a `console.toml` config file with the default - configuration values, overridden by any provided command-line - arguments - gen-completion - Generate shell completions - help - Print this message or the help of the given subcommand(s) + gen-config Generate a `console.toml` config file with the + default configuration values, overridden by any + provided command-line arguments + gen-completion Generate shell completions + help Print this message or the help of the given + subcommand(s) Arguments: [TARGET_ADDR] diff --git a/console-api/Cargo.toml b/console-api/Cargo.toml index 75d1c2f17..40bd7b9eb 100644 --- a/console-api/Cargo.toml +++ b/console-api/Cargo.toml @@ -3,7 +3,7 @@ name = "console-api" version = "0.6.0" license = "MIT" edition = "2021" -rust-version = "1.64.0" +rust-version = "1.70.0" authors = ["Eliza Weisman ", "Tokio Contributors ",] readme = "README.md" repository = "https://github.com/tokio-rs/console/" diff --git a/console-api/README.md b/console-api/README.md index 6420c575b..be74a69a2 100644 --- a/console-api/README.md +++ b/console-api/README.md @@ -44,7 +44,7 @@ The wire format [protobuf] bindings in this crate are used by both the instrumentation in the [`console-subscriber`] crate, which emits telemetry in this format, and by the clients that consume that telemetry. -In general, most [`tokio-console`] users will *not* depend on this crate +In general, most [`tokio-console`] users will _not_ depend on this crate directly. Applications are typically instrumented using the [`console-subscriber`] crate, which collects data and exports it using this wire format; this data can be consumed using the [`tokio-console`] @@ -96,7 +96,7 @@ console project. ## Supported Rust Versions The Tokio console is built against the latest stable release. The minimum -supported version is 1.64. The current Tokio console version is not guaranteed +supported version is 1.70. The current Tokio console version is not guaranteed to build on Rust versions earlier than the minimum supported version. ## License diff --git a/console-subscriber/Cargo.toml b/console-subscriber/Cargo.toml index 6e7e48cd4..14c75d4fe 100644 --- a/console-subscriber/Cargo.toml +++ b/console-subscriber/Cargo.toml @@ -3,7 +3,7 @@ name = "console-subscriber" version = "0.2.0" license = "MIT" edition = "2021" -rust-version = "1.64.0" +rust-version = "1.70.0" authors = ["Eliza Weisman ", "Tokio Contributors ",] readme = "README.md" repository = "https://github.com/tokio-rs/console/" diff --git a/console-subscriber/README.md b/console-subscriber/README.md index 12ac263cb..4d875bfbf 100644 --- a/console-subscriber/README.md +++ b/console-subscriber/README.md @@ -55,10 +55,11 @@ version 1.7.0 and newer. ### Enabling Tokio Instrumentation ⚠️ Currently, the [`tracing`] support in the [`tokio` -runtime][Tokio] is considered *experimental*. In order to use +runtime][Tokio] is considered _experimental_. In order to use `console-subscriber` with Tokio, the following is required: * Tokio's optional `tracing` dependency must be enabled. For example: + ```toml [dependencies] # ... @@ -68,14 +69,18 @@ runtime][Tokio] is considered *experimental*. In order to use * The `tokio_unstable` cfg flag, which enables experimental APIs in Tokio, must be enabled. It can be enabled by setting the `RUSTFLAGS` environment variable at build-time: + ```shell - $ RUSTFLAGS="--cfg tokio_unstable" cargo build + RUSTFLAGS="--cfg tokio_unstable" cargo build ``` + or, by adding the following to the `.cargo/config.toml` file in a Cargo workspace: + ```toml [build] rustflags = ["--cfg", "tokio_unstable"] ``` + If you're using a workspace, you should put the `.cargo/config.toml` file in the root of your workspace. Otherwise, put the `.cargo/config.toml` file in the root directory of your crate. @@ -93,21 +98,21 @@ runtime][Tokio] is considered *experimental*. In order to use * The `tokio` and `runtime` [`tracing` targets] must be enabled at the [`TRACE` level]. - + If you're using the [`console_subscriber::init()`][init] or + * If you're using the [`console_subscriber::init()`][init] or [`console_subscriber::Builder`][builder] APIs, these targets are enabled automatically. - + If you are manually configuring the `tracing` subscriber using the + * If you are manually configuring the `tracing` subscriber using the [`EnvFilter`] or [`Targets`] filters from [`tracing-subscriber`], add `"tokio=trace,runtime=trace"` to your filter configuration. - + Also, ensure you have not enabled any of the [compile time filter + * Also, ensure you have not enabled any of the [compile time filter features][compile_time_filters] in your `Cargo.toml`. #### Required Tokio Versions Because instrumentation for different aspects of the runtime is being added to -Tokio over time, the latest Tokio release is generally *recommended* to access all of +Tokio over time, the latest Tokio release is generally _recommended_ to access all of the console's functionality. However, it should generally be compatible with earlier Tokio versions, although some information may not be available. A minimum version of [Tokio v1.0.0] or later is required to use the console's @@ -202,7 +207,6 @@ tracing_subscriber::registry() [`Layer`]:https://docs.rs/tracing-subscriber/0.3/tracing_subscriber/layer/index.html [default]: https://docs.rs/tracing/latest/tracing/#in-executables [env]: https://docs.rs/console-subscriber/latest/console_subscriber/struct.Builder.html#method.with_default_env -[builder]: https://docs.rs/console-subscriber/latest/console_subscriber/struct.Builder.html [`tokio-console`]: https://github.com/tokio-rs/console [Tokio]: https://tokio.rs @@ -245,7 +249,7 @@ console project. ## Supported Rust Versions The Tokio console is built against the latest stable release. The minimum -supported version is 1.64. The current Tokio console version is not guaranteed +supported version is 1.70. The current Tokio console version is not guaranteed to build on Rust versions earlier than the minimum supported version. ## License diff --git a/tokio-console/Cargo.toml b/tokio-console/Cargo.toml index 81ec66a09..323046807 100644 --- a/tokio-console/Cargo.toml +++ b/tokio-console/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.10" license = "MIT" repository = "https://github.com/tokio-rs/console" edition = "2021" -rust-version = "1.64.0" +rust-version = "1.70.0" authors = ["Eliza Weisman ", "Tokio Contributors ",] readme = "README.md" default-run = "tokio-console" @@ -35,9 +35,8 @@ eula = false [dependencies] atty = "0.2" console-api = { version = "0.6.0", path = "../console-api", features = ["transport"] } -# Use 1.64.0 compatible version of `clap@4.1.14`. -clap = { version = "~4.1.14", features = ["wrap_help", "cargo", "derive", "env"] } -clap_complete = "~4.1.6" +clap = { version = "4.4.18", features = ["wrap_help", "cargo", "derive", "env"] } +clap_complete = "4.4.10" tokio = { version = "1", features = ["full", "rt-multi-thread"] } tonic = { version = "0.10", features = ["transport"] } futures = "0.3" @@ -62,5 +61,4 @@ toml = "0.5" dirs = "5" [dev-dependencies] -# Use 1.64.0 compatible version of `trycmd@0.13.6`. -trycmd = "=0.13.6" +trycmd = "0.14.20" diff --git a/tokio-console/README.md b/tokio-console/README.md index 86cbd3945..7a07de0f3 100644 --- a/tokio-console/README.md +++ b/tokio-console/README.md @@ -40,13 +40,14 @@ system consists of two primary components: This crate is the primary consumer of `tokio-console` telemetry, a command-line application that provides an interactive debugging interface. -[wire format]: https://crates.io/crates/console-api [subscriber]: https://crates.io/crates/console-subscriber + ## Getting Started To use the console to monitor and debug a program, it must be instrumented to emit the data the console consumes. Then, the `tokio-console` CLI application can be used to connect to the application and monitor its operation. + ### Instrumenting the Application Before the console can connect to an application, it must first be instrumented @@ -57,12 +58,12 @@ to record `tokio-console` telemetry. The easiest way to do this is [using the emit [`tracing`] data in a format that the console can record. For programs that use the [Tokio] runtime, this means that: -- Tokio's [unstable features][unstable] must be enabled. See [the `console-subscriber` +* Tokio's [unstable features][unstable] must be enabled. See [the `console-subscriber` documentation][unstable] for details. -- A [compatible Tokio version][versions] must be used. Tokio v1.0 or greater is required +* A [compatible Tokio version][versions] must be used. Tokio v1.0 or greater is required to use the console, and some features are only available in later versions. See [the `console-subscriber` documentation][versions] for details. - + [`tracing`]: https://crates.io/crates/tracing [unstable]: https://docs.rs/console-subscriber/0.1/console_subscriber/#enabling-tokio-instrumentation [versions]: https://docs.rs/console-subscriber/0.1/console_subscriber/#required-tokio-versions @@ -91,6 +92,7 @@ tokio-console http://192.168.0.42:9090 ``` A DNS name can also be provided as the target address: + ```shell tokio-console http://my.instrumented.application.local:6669 ``` @@ -98,6 +100,7 @@ tokio-console http://my.instrumented.application.local:6669 See [here][cli-ref] for a complete list of all command-line arguments. Tokio Console has a numnber of different views: + * [Tasks List](#tasks-list) * [Task Details](#task-details) * [Resources List](#resources-list) @@ -209,8 +212,6 @@ behavior. See [the documentation][cfg-ref] for details. [Tokio]: https://tokio.rs [asynchronous tasks]: https://tokio.rs/tokio/tutorial/spawning#tasks [resources]: https://tokio.rs/tokio/tutorial/async#async-fn-as-a-future -[`tokio::sync::oneshot`]: https://docs.rs/tokio/latest/tokio/sync/oneshot/index.html -[`tokio::sync::Semaphore`]: https://docs.rs/tokio/latest/tokio/sync/struct.Semaphore.html [cli-ref]: https://docs.rs/tokio-console/latest/tokio_console/config_reference/index.html#command-line-arguments [cfg-ref]: https://docs.rs/tokio-console/latest/tokio_console/config_reference/index.html#configuration-file @@ -236,7 +237,7 @@ console project. ## Supported Rust Versions The Tokio console is built against the latest stable release. The minimum -supported version is 1.64. The current Tokio console version is not guaranteed +supported version is 1.70. The current Tokio console version is not guaranteed to build on Rust versions earlier than the minimum supported version. ## License diff --git a/tokio-console/tests/cli-ui.stdout b/tokio-console/tests/cli-ui.stdout index 1db3373a2..596e8a1b2 100644 --- a/tokio-console/tests/cli-ui.stdout +++ b/tokio-console/tests/cli-ui.stdout @@ -3,14 +3,12 @@ The Tokio console: a debugger for async Rust. Usage: tokio-console[EXE] [OPTIONS] [TARGET_ADDR] [COMMAND] Commands: - gen-config - Generate a `console.toml` config file with the default - configuration values, overridden by any provided command-line - arguments - gen-completion - Generate shell completions - help - Print this message or the help of the given subcommand(s) + gen-config Generate a `console.toml` config file with the + default configuration values, overridden by any + provided command-line arguments + gen-completion Generate shell completions + help Print this message or the help of the given + subcommand(s) Arguments: [TARGET_ADDR] diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index adac3529e..81f8a37d7 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.64.0" +rust-version = "1.70.0" publish = false [dependencies] -tonic-build = { version = "0.10", default-features = false, features = [ +tonic-build = { version = "0.10.2", default-features = false, features = [ "prost", "transport" ] } -clap = { version = "~4.1.14", features = ["derive"] } -color-eyre = "0.6" +clap = { version = "4.4.18", features = ["derive"] } +color-eyre = "0.6.2"