Merge 'tokio-1.25.2' into 'tokio-1.32.x' (#6027)

tokio-rs · Sep 22, 2023 · ccb37c4 · ccb37c4
2 parents a7d52c2 + 9ab4ca6
commit ccb37c4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 1 deletion.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -411,7 +411,6 @@ jobs:
  target:
  - powerpc-unknown-linux-gnu
  - powerpc64-unknown-linux-gnu
- - mips-unknown-linux-gnu
  - arm-linux-androideabi
  - mipsel-unknown-linux-musl
  steps:

diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
@@ -360,6 +360,16 @@ This release bumps the MSRV of Tokio to 1.56. ([#5559])
 [#5513]: https://github.com/tokio-rs/tokio/pull/5513
 [#5517]: https://github.com/tokio-rs/tokio/pull/5517
 
+# 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.
@@ -706,6 +716,16 @@ wasm32-wasi target is given unstable support for the `net` feature.
 [#4956]: https://github.com/tokio-rs/tokio/pull/4956
 [#4959]: https://github.com/tokio-rs/tokio/pull/4959
 
+# 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/src/future/mod.rs b/tokio/src/future/mod.rs
@@ -20,6 +20,7 @@ cfg_sync! {
 
 cfg_trace! {
  mod trace;
+ #[allow(unused_imports)]
  pub(crate) use trace::InstrumentedFuture as Future;
 }