From 938c7eb0234b93e491de69c86f5d2a30c8663df7 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Fri, 22 Sep 2023 13:44:00 +0200 Subject: [PATCH] chore: prepare Tokio v1.20.6 (#6024) --- README.md | 2 +- tokio/CHANGELOG.md | 10 ++++++++++ tokio/Cargo.toml | 2 +- tokio/README.md | 2 +- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 2f7126a770b..47791429999 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.20.5", features = ["full"] } +tokio = { version = "1.20.6", features = ["full"] } ``` Then, on your main.rs: diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index d01d91bab24..f641a1a92d7 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,13 @@ +# 1.20.6 (September 22, 2023) + +This is a backport of a change from 1.27.0. + +### Changed + +- io: use `memchr` from `libc` ([#5960]) + +[#5960]: https://github.com/tokio-rs/tokio/pull/5960 + # 1.20.5 (May 28, 2023) Forward ports 1.18.6 changes. diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index b9e5934b442..9ebc10ad8b7 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -6,7 +6,7 @@ name = "tokio" # - README.md # - Update CHANGELOG.md. # - Create "v1.0.x" git tag. -version = "1.20.5" +version = "1.20.6" edition = "2018" rust-version = "1.49" authors = ["Tokio Contributors "] diff --git a/tokio/README.md b/tokio/README.md index 2f7126a770b..47791429999 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.20.5", features = ["full"] } +tokio = { version = "1.20.6", features = ["full"] } ``` Then, on your main.rs: