From 9ab4ca68ac0016923ca13736f7066fb3c7527308 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Fri, 22 Sep 2023 18:28:38 +0200 Subject: [PATCH] chore: prepare Tokio v1.25.2 (#6026) --- 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 659a69c8afc..b63b781701a 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.25.1", features = ["full"] } +tokio = { version = "1.25.2", features = ["full"] } ``` Then, on your main.rs: diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index 2cac89ee427..b5cf019f50a 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,13 @@ +# 1.25.2 (September 22, 2023) + +Forward ports 1.20.6 changes. + +### Changed + +- io: use `memchr` from `libc` ([#5960]) + +[#5960]: https://github.com/tokio-rs/tokio/pull/5960 + # 1.25.1 (May 28, 2023) Forward ports 1.18.6 changes. diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 38da82234ad..a0b3b710415 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.25.1" +version = "1.25.2" edition = "2018" rust-version = "1.49" authors = ["Tokio Contributors "] diff --git a/tokio/README.md b/tokio/README.md index 659a69c8afc..b63b781701a 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.25.1", features = ["full"] } +tokio = { version = "1.25.2", features = ["full"] } ``` Then, on your main.rs: