From ffb305190621080a2a76a20abe70ffd159a035f0 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Fri, 6 Jan 2023 11:13:51 +0100 Subject: [PATCH 1/2] chore: prepare Tokio v1.24.1 --- README.md | 2 +- tokio/CHANGELOG.md | 9 +++++++++ tokio/Cargo.toml | 2 +- tokio/README.md | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index dd4a96a2f18..7bf8befff04 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Make sure you activated the full features of the tokio crate on Cargo.toml: ```toml [dependencies] -tokio = { version = "1.24.0", features = ["full"] } +tokio = { version = "1.24.1", features = ["full"] } ``` Then, on your main.rs: diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index 8428aad36dc..dc579c471fe 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,12 @@ +# 1.24.1 (January 6, 2022) + +This release fixes a compilation failure when using ([#5356]) +``` +RUSTFLAGS='--cfg tokio_no_atomic_u64 --cfg tokio_no_const_mutex_new' +``` + +[#5356]: https://github.com/tokio-rs/tokio/pull/5356 + # 1.24.0 (January 5, 2022) ### Fixed diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 6055e78520a..3b685e2e9c3 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -6,7 +6,7 @@ name = "tokio" # - README.md # - Update CHANGELOG.md. # - Create "v1.x.y" git tag. -version = "1.24.0" +version = "1.24.1" edition = "2018" rust-version = "1.49" authors = ["Tokio Contributors "] diff --git a/tokio/README.md b/tokio/README.md index dd4a96a2f18..7bf8befff04 100644 --- a/tokio/README.md +++ b/tokio/README.md @@ -56,7 +56,7 @@ Make sure you activated the full features of the tokio crate on Cargo.toml: ```toml [dependencies] -tokio = { version = "1.24.0", features = ["full"] } +tokio = { version = "1.24.1", features = ["full"] } ``` Then, on your main.rs: From f9685188b8589d14b9a9fb4fe31f8d3c26fca04b Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Fri, 6 Jan 2023 11:25:55 +0100 Subject: [PATCH 2/2] Update tokio/CHANGELOG.md Co-authored-by: Taiki Endo --- tokio/CHANGELOG.md | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index dc579c471fe..65a600a8947 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,9 +1,6 @@ # 1.24.1 (January 6, 2022) -This release fixes a compilation failure when using ([#5356]) -``` -RUSTFLAGS='--cfg tokio_no_atomic_u64 --cfg tokio_no_const_mutex_new' -``` +This release fixes a compilation failure on targets without `AtomicU64` when using rustc older than 1.63. ([#5356]) [#5356]: https://github.com/tokio-rs/tokio/pull/5356