Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge 1.20.5 into 1.25.x #5733

Merged
merged 6 commits into from May 27, 2023
Merged

Merge 1.20.5 into 1.25.x #5733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
2a18018
ci: fix CI for 1.18.x branch (#5728)
Darksonn May 27, 2023
d6a9ef5
tokio: disable default features for mio (#5728)
Darksonn May 27, 2023
0f898a3
chore: prepare Tokio v1.18.6 (#5729)
Darksonn May 27, 2023
9877fa2
Merge 'tokio-1.18.6' into 'tokio-1.20.x' (#5730)
Darksonn May 27, 2023
edd172c
chore: prepare Tokio v1.20.5 (#5731)
Darksonn May 27, 2023
8ddb58b
Merge 'tokio-1.20.5' into 'tokio-1.25.x' (#5733)
Darksonn May 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions tokio/CHANGELOG.md
View file
Open in desktop
Expand Up @@ -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.
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion tokio/Cargo.toml
View file
Open in desktop
Expand Up @@ -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 }

Expand Down