From 25e1efcb6445828eaa950e5362ae0f83a4836c13 Mon Sep 17 00:00:00 2001 From: Josh McKinney Date: Mon, 8 Apr 2024 09:06:04 -0700 Subject: [PATCH] bump msrv to 1.74 --- .github/workflows/ci.yaml | 2 +- console-api/Cargo.toml | 18 ++++++++---------- console-api/README.md | 2 +- console-subscriber/Cargo.toml | 20 +++++++++++++++----- console-subscriber/README.md | 2 +- tokio-console/Cargo.toml | 34 +++++++++++++++++++++------------- tokio-console/README.md | 2 +- xtask/Cargo.toml | 5 +++-- 8 files changed, 51 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a000b00f5..32c40ea94 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -51,7 +51,7 @@ jobs: os: [ubuntu-latest, macos-latest, windows-latest] rust: [stable] include: - - rust: 1.70.0 + - rust: 1.74.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/console-api/Cargo.toml b/console-api/Cargo.toml index 40bd7b9eb..bc6a13608 100644 --- a/console-api/Cargo.toml +++ b/console-api/Cargo.toml @@ -3,8 +3,11 @@ name = "console-api" version = "0.6.0" license = "MIT" edition = "2021" -rust-version = "1.70.0" -authors = ["Eliza Weisman ", "Tokio Contributors ",] +rust-version = "1.74.0" +authors = [ + "Eliza Weisman ", + "Tokio Contributors ", +] readme = "README.md" repository = "https://github.com/tokio-rs/console/" homepage = "https://github.com/tokio-rs/console/blob/main/console-api" @@ -16,13 +19,7 @@ categories = [ "development-tools::profiling", "asynchronous", ] -keywords = [ - "tracing", - "tokio-console", - "debugging", - "async", - "tonic", -] +keywords = ["tracing", "tokio-console", "debugging", "async", "tonic"] [features] # Generate code that is compatible with Tonic's `transport` module. @@ -41,7 +38,8 @@ futures-core = "0.3" [dev-dependencies] tonic-build = { version = "0.10", default-features = false, features = [ - "prost", "transport" + "prost", + "transport", ] } # explicit dep so we can get the version with fixed whitespace. prost-build = "0.12.0" diff --git a/console-api/README.md b/console-api/README.md index be74a69a2..e0a53b006 100644 --- a/console-api/README.md +++ b/console-api/README.md @@ -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.70. The current Tokio console version is not guaranteed +supported version is 1.74. 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 14c75d4fe..335ece482 100644 --- a/console-subscriber/Cargo.toml +++ b/console-subscriber/Cargo.toml @@ -3,8 +3,11 @@ name = "console-subscriber" version = "0.2.0" license = "MIT" edition = "2021" -rust-version = "1.70.0" -authors = ["Eliza Weisman ", "Tokio Contributors ",] +rust-version = "1.74.0" +authors = [ + "Eliza Weisman ", + "Tokio Contributors ", +] readme = "README.md" repository = "https://github.com/tokio-rs/console/" homepage = "https://github.com/tokio-rs/console/blob/main/console-subscriber" @@ -35,13 +38,20 @@ crossbeam-utils = "0.8.7" 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.6.0", path = "../console-api", features = ["transport"] } +console-api = { version = "0.6.0", path = "../console-api", features = [ + "transport", +] } tonic = { version = "0.10", features = ["transport"] } tracing-core = "0.1.24" tracing = "0.1.26" -tracing-subscriber = { version = "0.3.17", 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"] } +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 } diff --git a/console-subscriber/README.md b/console-subscriber/README.md index 4d875bfbf..e165f6d6b 100644 --- a/console-subscriber/README.md +++ b/console-subscriber/README.md @@ -249,7 +249,7 @@ console project. ## Supported Rust Versions The Tokio console is built against the latest stable release. The minimum -supported version is 1.70. The current Tokio console version is not guaranteed +supported version is 1.74. 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 5aa4228e2..feaa703f1 100644 --- a/tokio-console/Cargo.toml +++ b/tokio-console/Cargo.toml @@ -4,8 +4,11 @@ version = "0.1.10" license = "MIT" repository = "https://github.com/tokio-rs/console" edition = "2021" -rust-version = "1.70.0" -authors = ["Eliza Weisman ", "Tokio Contributors ",] +rust-version = "1.74.0" +authors = [ + "Eliza Weisman ", + "Tokio Contributors ", +] readme = "README.md" default-run = "tokio-console" homepage = "https://github.com/tokio-rs/console/tree/main/tokio-console" @@ -18,13 +21,7 @@ categories = [ "command-line-utilities", "asynchronous", ] -keywords = [ - "tracing", - "tokio-console", - "debugging", - "console", - "async", -] +keywords = ["tracing", "tokio-console", "debugging", "console", "async"] [package.metadata.wix] upgrade-guid = "A36733B4-B8CD-440A-8E06-549EAE8A6695" @@ -33,13 +30,22 @@ license = false eula = false [dependencies] -console-api = { version = "0.6.0", path = "../console-api", features = ["transport"] } -clap = { version = "4.4.18", features = ["wrap_help", "cargo", "derive", "env"] } +console-api = { version = "0.6.0", path = "../console-api", features = [ + "transport", +] } +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" -ratatui = { version = "0.26.1", default-features = false, features = ["crossterm"] } +ratatui = { version = "0.26.1", default-features = false, features = [ + "crossterm", +] } tower = "0.4.12" tracing = "0.1" tracing-subscriber = { version = "0.3" } @@ -47,7 +53,9 @@ tracing-journald = { version = "0.2", optional = true } prost-types = "0.12" crossterm = { version = "0.27.0", features = ["event-stream"] } color-eyre = { version = "0.6", features = ["issue-url"] } -hdrhistogram = { version = "7.3.0", default-features = false, features = ["serialization"] } +hdrhistogram = { version = "7.3.0", default-features = false, features = [ + "serialization", +] } # Keep this in sync with the version from `tonic`. # Because we inspect the error from tonic, we need to make sure that the # version of h2 we use is compatible with the version of tonic we use. diff --git a/tokio-console/README.md b/tokio-console/README.md index 7a07de0f3..b76fa6379 100644 --- a/tokio-console/README.md +++ b/tokio-console/README.md @@ -237,7 +237,7 @@ console project. ## Supported Rust Versions The Tokio console is built against the latest stable release. The minimum -supported version is 1.70. The current Tokio console version is not guaranteed +supported version is 1.74. The current Tokio console version is not guaranteed to build on Rust versions earlier than the minimum supported version. ## License diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 81f8a37d7..390b03cdc 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -3,12 +3,13 @@ name = "xtask" version = "0.1.0" license = "MIT" edition = "2021" -rust-version = "1.70.0" +rust-version = "1.74.0" publish = false [dependencies] tonic-build = { version = "0.10.2", default-features = false, features = [ - "prost", "transport" + "prost", + "transport", ] } clap = { version = "4.4.18", features = ["derive"] } color-eyre = "0.6.2"