From 1b1b9dc7e388d0619fe7bfe6a7618fff596fdee1 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Thu, 29 Jun 2023 14:27:28 -0700 Subject: [PATCH] chore: prepare Tokio v1.29.1 release --- README.md | 2 +- tokio/CHANGELOG.md | 8 ++++++++ tokio/Cargo.toml | 2 +- tokio/README.md | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bea3827ea3a..fb2c149abdd 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.29.0", features = ["full"] } +tokio = { version = "1.29.1", features = ["full"] } ``` Then, on your main.rs: diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index 324fc9be170..aea22c6d985 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,11 @@ +# 1.29.1 (June 29, 2023) + +### Fixed + +- rt: fix nesting two `block_in_place` with a `block_on` between ([#5837]) + +[#5837]: https://github.com/tokio-rs/tokio/pull/5837 + # 1.29.0 (June 27, 2023) Technically a breaking change, the `Send` implementation is removed from diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 9f01b517342..0a530ff88fa 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.29.0" +version = "1.29.1" edition = "2021" rust-version = "1.56" authors = ["Tokio Contributors "] diff --git a/tokio/README.md b/tokio/README.md index bea3827ea3a..fb2c149abdd 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.29.0", features = ["full"] } +tokio = { version = "1.29.1", features = ["full"] } ``` Then, on your main.rs: