Merge 'tokio-1.20.5' into 'tokio-1.25.x' (#5733)

tokio-rs · May 27, 2023 · 8ddb58b · 8ddb58b
2 parents 4b032a2 + edd172c
commit 8ddb58b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
@@ -334,6 +334,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.5 (May 28, 2023)
+
+Forward ports 1.18.6 changes.
+
+### Fixed
+
+- deps: disable default features for mio ([#5728])
+
+[#5728]: https://github.com/tokio-rs/tokio/pull/5728
+
 # 1.20.4 (January 17, 2023)
 
 Forward ports 1.18.5 changes.
@@ -480,6 +490,14 @@ This release fixes a bug in `Notified::enable`. ([#4747])
 [#4729]: https://github.com/tokio-rs/tokio/pull/4729
 [#4739]: https://github.com/tokio-rs/tokio/pull/4739
 
+# 1.18.6 (May 28, 2023)
+
+### Fixed
+
+- deps: disable default features for mio ([#5728])
+
+[#5728]: https://github.com/tokio-rs/tokio/pull/5728
+
 # 1.18.5 (January 17, 2023)
 
 ### Fixed

diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
@@ -104,7 +104,7 @@ pin-project-lite = "0.2.0"
 # Everything else is optional...
 bytes = { version = "1.0.0", optional = true }
 memchr = { version = "2.2", optional = true }
-mio = { version = "0.8.4", optional = true }
+mio = { version = "0.8.4", optional = true, default-features = false }
 num_cpus = { version = "1.8.0", optional = true }
 parking_lot = { version = "0.12.0", optional = true }