From 2e2814ed4f685e0301892a1f5fb6928d005b49ed 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 | 349 ++++++++++++++++++------------ 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, 256 insertions(+), 185 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 7b16a0b16..e6fdd7e89 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.56" @@ -89,7 +137,7 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi", "libc", "winapi", ] @@ -225,44 +273,41 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.1.14" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "906f7fe1da4185b7a282b2bc90172a496f9def1aca4545fe7526810741591e14" +checksum = "1e578d6ec4194633722ccf9544794b71b1385c3c027efe0c55db226fc880865c" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap_builder" -version = "4.1.14" +version = "4.4.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "351f9ad9688141ed83dfd8f5fb998a06225ef444b48ff4dc43de6d409b7fd10b" +checksum = "4df4df40ec50c46000231c914968278b1eb05098cf8f1b3a518a95030e71d1c7" 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.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40d3120a421cd111c43f1a6c7d0dd83bb6aaa0659c164468a1654014632a5ec6" +checksum = "abb745187d7f4d76267b37485a65e0149edd0e91a4cfcdd3f27524ad86cee9f3" dependencies = [ "clap", ] [[package]] name = "clap_derive" -version = "4.1.14" +version = "4.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81d7dc0031c3a59a04fc2ba395c8e2dd463cba1859275f065d225f6122221b45" +checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442" dependencies = [ "heck", "proc-macro2", @@ -272,9 +317,9 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.4.1" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1" +checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "color-eyre" @@ -305,14 +350,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" @@ -327,23 +368,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" @@ -503,6 +527,12 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "errno" version = "0.3.3" @@ -713,7 +743,7 @@ dependencies = [ "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.8.1", "slab", "tokio", "tokio-util", @@ -764,12 +794,6 @@ dependencies = [ "libc", ] -[[package]] -name = "hermit-abi" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" - [[package]] name = "http" version = "0.2.9" @@ -883,6 +907,16 @@ dependencies = [ "hashbrown 0.11.2", ] +[[package]] +name = "indexmap" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824b2ae422412366ba479e8111fd301f7b5faece8149317bb81925979a53f520" +dependencies = [ + "equivalent", + "hashbrown 0.14.3", +] + [[package]] name = "indoc" version = "2.0.4" @@ -898,37 +932,6 @@ dependencies = [ "cfg-if", ] -[[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.3", - "libc", - "windows-sys 0.48.0", -] - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi 0.3.3", - "rustix 0.38.15", - "windows-sys 0.48.0", -] - -[[package]] -name = "itertools" -version = "0.10.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9a9d19fa1e79b6215ff29b9d6880b706147f16e9b1dbb1e4e5947b5b02bc5e3" -dependencies = [ - "either", -] - [[package]] name = "itertools" version = "0.11.0" @@ -965,12 +968,6 @@ version = "0.2.148" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b" -[[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.8" @@ -1119,7 +1116,7 @@ version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" dependencies = [ - "hermit-abi 0.1.19", + "hermit-abi", "libc", ] @@ -1208,7 +1205,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a13a2fa9d0b63e5f22328828741e523766fff0ee9e779316902290dff3f824f" dependencies = [ "fixedbitset", - "indexmap", + "indexmap 1.8.1", ] [[package]] @@ -1489,20 +1486,6 @@ version = "0.1.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" -[[package]] -name = "rustix" -version = "0.37.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4eb579851244c2c03e7c24f501c3432bed80b8f720af1d6e5b0e0f01555a035" -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.15" @@ -1512,7 +1495,7 @@ dependencies = [ "bitflags 2.4.0", "errno", "libc", - "linux-raw-sys 0.4.8", + "linux-raw-sys", "windows-sys 0.48.0", ] @@ -1574,6 +1557,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.4" @@ -1639,14 +1631,16 @@ checksum = "62bb4feee49fdd9f707ef802e22365a35de4b7b299de4763d44bfea899442ff9" [[package]] name = "snapbox" -version = "0.3.3" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44d199ccf8f606592df2d145db26f2aa45344e23c64b074cc5a4047f1d99b0f7" +checksum = "73145a30df4935f50a7b13c1882bce7d194d7071ad0bcc36e7cacbf9ef16e3ec" dependencies = [ - "concolor", + "anstream", + "anstyle", "content_inspector", "dunce", "filetime", + "libc", "normalize-line-endings", "os_pipe", "similar", @@ -1654,14 +1648,17 @@ dependencies = [ "tempfile", "wait-timeout", "walkdir", - "yansi", + "windows-sys 0.52.0", ] [[package]] name = "snapbox-macros" -version = "0.3.0" +version = "0.3.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a253e6f894cfa440cba00600a249fa90869d8e0ec45ab274a456e043a0ce8f2" +checksum = "78ccde059aad940984ff696fe8c280900f7ea71a6fb45fce65071a3f2c40b667" +dependencies = [ + "anstream", +] [[package]] name = "socket2" @@ -1759,22 +1756,13 @@ dependencies = [ "winapi", ] -[[package]] -name = "termcolor" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" -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.25", + "rustix", "windows-sys 0.48.0", ] @@ -1929,16 +1917,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.21.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5376256e44f2443f8896ac012507c19a012df0fe8758b55246ae51a2279db51f" +checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ - "combine", - "indexmap", - "itertools 0.10.3", + "indexmap 2.2.2", "serde", + "serde_spanned", + "toml_datetime", + "winnow", ] [[package]] @@ -1970,9 +1968,9 @@ dependencies = [ [[package]] name = "tonic-build" -version = "0.10.0" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b477abbe1d18c0b08f56cd01d1bc288668c5b5cfd19b2ae1886bbf599c546f1" +checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889" dependencies = [ "prettyplease", "proc-macro2", @@ -1989,7 +1987,7 @@ checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" dependencies = [ "futures-core", "futures-util", - "indexmap", + "indexmap 1.8.1", "pin-project", "pin-project-lite", "rand", @@ -2106,9 +2104,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" [[package]] name = "trycmd" -version = "0.13.6" +version = "0.14.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ac9fa73959e252e7c5a4e6260544b952f5bf3989e0b7ad229f4fd6f14671b02" +checksum = "b7ad3a033f38ca4d9eedf36ba792622027119c61b62b57970c5bed42cfd0c40d" dependencies = [ "glob", "humantime", @@ -2171,6 +2169,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" @@ -2298,7 +2302,16 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", ] [[package]] @@ -2307,21 +2320,42 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", + "windows_aarch64_gnullvm 0.48.5", "windows_aarch64_msvc 0.48.5", "windows_i686_gnu 0.48.5", "windows_i686_msvc 0.48.5", "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm", + "windows_x86_64_gnullvm 0.48.5", "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows-targets" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +dependencies = [ + "windows_aarch64_gnullvm 0.52.0", + "windows_aarch64_msvc 0.52.0", + "windows_i686_gnu 0.52.0", + "windows_i686_msvc 0.52.0", + "windows_x86_64_gnu 0.52.0", + "windows_x86_64_gnullvm 0.52.0", + "windows_x86_64_msvc 0.52.0", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" + [[package]] name = "windows_aarch64_msvc" version = "0.34.0" @@ -2340,6 +2374,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_aarch64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" + [[package]] name = "windows_i686_gnu" version = "0.34.0" @@ -2358,6 +2398,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" + [[package]] name = "windows_i686_msvc" version = "0.34.0" @@ -2376,6 +2422,12 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_i686_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" + [[package]] name = "windows_x86_64_gnu" version = "0.34.0" @@ -2394,12 +2446,24 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnu" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" + [[package]] name = "windows_x86_64_msvc" version = "0.34.0" @@ -2418,6 +2482,21 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "windows_x86_64_msvc" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" + +[[package]] +name = "winnow" +version = "0.5.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5" +dependencies = [ + "memchr", +] + [[package]] name = "xtask" version = "0.1.0" @@ -2427,12 +2506,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 b5a4db4d8..1693eee25 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 113a4ceb3..db48bed41 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 4f33e9e91..e28a5b84a 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" @@ -29,9 +29,8 @@ keywords = [ [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" @@ -56,5 +55,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 519a82dbd..144529ee5 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"