From f2d033e4541d3e814e19b19ddd8a07ff1302ddbb Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Tue, 9 May 2023 21:57:35 +0200 Subject: [PATCH 1/2] build: fix warnings in AS_FD_PROBE (#5677) --- tokio/build.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tokio/build.rs b/tokio/build.rs index 2d2ec5641..b8234dde9 100644 --- a/tokio/build.rs +++ b/tokio/build.rs @@ -19,13 +19,14 @@ const CONST_MUTEX_NEW_PROBE: &str = r#" const AS_FD_PROBE: &str = r#" { - #![allow(unused_imports)] - + #[allow(unused_imports)] #[cfg(unix)] use std::os::unix::prelude::AsFd as _; + #[allow(unused_imports)] #[cfg(windows)] use std::os::windows::prelude::AsSocket as _; - #[cfg(target = "wasm32-wasi")] + #[allow(unused_imports)] + #[cfg(target_os = "wasi")] use std::os::wasi::prelude::AsFd as _; } "#; From a26fc9c9f956a66d086b8e43dbf9b2a8fe9b14de Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Wed, 10 May 2023 10:44:04 +0200 Subject: [PATCH 2/2] chore: prepare Tokio v1.28.1 (#5679) --- README.md | 2 +- tokio/CHANGELOG.md | 7 +++++++ tokio/Cargo.toml | 2 +- tokio/README.md | 2 +- 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 145ae4c80..bb24029ea 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.28.0", features = ["full"] } +tokio = { version = "1.28.1", features = ["full"] } ``` Then, on your main.rs: diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index e51ad14d1..659e4200a 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,10 @@ +# 1.28.1 (May 10th, 2023) + +This release fixes a mistake in the build script that makes `AsFd` +implementations unavailable on Rust 1.63. ([#5677]) + +[#5677]: https://github.com/tokio-rs/tokio/pull/5677 + # 1.28.0 (April 25th, 2023) ### Added diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 0b93f6184..94a5a5b22 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.28.0" +version = "1.28.1" edition = "2021" rust-version = "1.56" authors = ["Tokio Contributors "] diff --git a/tokio/README.md b/tokio/README.md index 145ae4c80..bb24029ea 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.28.0", features = ["full"] } +tokio = { version = "1.28.1", features = ["full"] } ``` Then, on your main.rs: