From 2dec2ac4e5e597b89d6385d93a4e49d5cde4532f Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Tue, 1 Jul 2025 14:03:36 -0700 Subject: [PATCH 1/4] chore: prepare Tokio v1.46.0 # 1.46.0 (July 1st, 2025) ### Fixed - net: fixed `TcpStream::shutdown` incorrectly returning an error on macOS ([#7290]) ## Added - sync: `mpsc::OwnedPermit::{same_channel, same_channel_as_sender}` methods ([#7389]) - macros: `biased` option for `join!` and `try_join!`, similar to `select!` ([#7307]) - net: support for cygwin ([#7393]) - net: support `pope::OpenOptions::read_write` on Android ([#7426]) - net: add `Clone` implementation for `net::unix::SocketAddr` ([#7422]) ## Changed - runtime: eliminate unnecessary lfence while operating on `queue::Local` ([#7340]) - task: disallow blocking in `LocalSet::{poll,drop}` ([#7372]) ## Unstable - runtime: add `TaskMeta::spawn_location` tracking where a task was spawned ([#7417]) - runtime: removed borrow from `LocalOptions` parameter to `runtime::Builder::build_local` ([#7346]) ## Documented - io: clarify behavior of seeking when `start_seek` is not used ([#7366]) - io: document cancellation safety of `AsyncWriteExt::flush` ([#7364]) - net: fix docs for `recv_buffer_size` method ([#7336]) - net: fix broken link of `RawFd` in `TcpSocket` docs ([#7416]) - net: update `AsRawFd` doc link to current Rust stdlib location ([#7429]) - readme: fix double period in reactor description (#7363) - runtime: add doc note that `on_*_task_poll` is unstable ([#7311]) - sync: update broadcast docs on allocation failure ([#7352]) - time: add a missing panic scenario of `time::advance` ([#7394]) [#7290]: https://github.com/tokio-rs/tokio/pull/7290 [#7307]: https://github.com/tokio-rs/tokio/pull/7307 [#7311]: https://github.com/tokio-rs/tokio/pull/7311 [#7336]: https://github.com/tokio-rs/tokio/pull/7336 [#7340]: https://github.com/tokio-rs/tokio/pull/7340 [#7346]: https://github.com/tokio-rs/tokio/pull/7346 [#7352]: https://github.com/tokio-rs/tokio/pull/7352 [#7364]: https://github.com/tokio-rs/tokio/pull/7364 [#7366]: https://github.com/tokio-rs/tokio/pull/7366 [#7372]: https://github.com/tokio-rs/tokio/pull/7372 [#7389]: https://github.com/tokio-rs/tokio/pull/7389 [#7393]: https://github.com/tokio-rs/tokio/pull/7393 [#7394]: https://github.com/tokio-rs/tokio/pull/7394 [#7416]: https://github.com/tokio-rs/tokio/pull/7416 [#7422]: https://github.com/tokio-rs/tokio/pull/7422 [#7426]: https://github.com/tokio-rs/tokio/pull/7426 [#7429]: https://github.com/tokio-rs/tokio/pull/7429 [#7417]: https://github.com/tokio-rs/tokio/pull/7417 --- README.md | 2 +- tokio/CHANGELOG.md | 62 ++++++++++++++++++++++++++++++++++++++++++++++ tokio/Cargo.toml | 2 +- tokio/README.md | 2 +- 4 files changed, 65 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a01e6f4a7be..ef44167a1fc 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.45.1", features = ["full"] } +tokio = { version = "1.46.0", features = ["full"] } ``` Then, on your main.rs: diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index 27f84c867f4..26f3b55a041 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,65 @@ +# 1.46.0 (July 1st, 2025) + +### Fixed + +- net: fixed `TcpStream::shutdown` incorrectly returning an error on macOS + ([#7290]) + +## Added + +- sync: `mpsc::OwnedPermit::{same_channel, same_channel_as_sender}` methods + ([#7389]) +- macros: `biased` option for `join!` and `try_join!`, similar to `select!` + ([#7307]) +- net: support for cygwin ([#7393]) +- net: support `pope::OpenOptions::read_write` on Android ([#7426]) +- net: add `Clone` implementation for `net::unix::SocketAddr` ([#7422]) + +## Changed + +- runtime: eliminate unnecessary lfence while operating on `queue::Local` + ([#7340]) +- task: disallow blocking in `LocalSet::{poll,drop}` ([#7372]) + +## Unstable + +- runtime: add `TaskMeta::spawn_location` tracking where a task was spawned + ([#7417]) +- runtime: removed borrow from `LocalOptions` parameter to + `runtime::Builder::build_local` ([#7346]) + +## Documented + +- io: clarify behavior of seeking when `start_seek` is not used ([#7366]) +- io: document cancellation safety of `AsyncWriteExt::flush` ([#7364]) +- net: fix docs for `recv_buffer_size` method ([#7336]) +- net: fix broken link of `RawFd` in `TcpSocket` docs ([#7416]) +- net: update `AsRawFd` doc link to current Rust stdlib location ([#7429]) +- readme: fix double period in reactor description ([#7363]) +- runtime: add doc note that `on_*_task_poll` is unstable ([#7311]) +- sync: update broadcast docs on allocation failure ([#7352]) +- time: add a missing panic scenario of `time::advance` ([#7394]) + +[#7290]: https://github.com/tokio-rs/tokio/pull/7290 +[#7307]: https://github.com/tokio-rs/tokio/pull/7307 +[#7311]: https://github.com/tokio-rs/tokio/pull/7311 +[#7336]: https://github.com/tokio-rs/tokio/pull/7336 +[#7340]: https://github.com/tokio-rs/tokio/pull/7340 +[#7346]: https://github.com/tokio-rs/tokio/pull/7346 +[#7352]: https://github.com/tokio-rs/tokio/pull/7352 +[#7363]: https://github.com/tokio-rs/tokio/pull/7363 +[#7364]: https://github.com/tokio-rs/tokio/pull/7364 +[#7366]: https://github.com/tokio-rs/tokio/pull/7366 +[#7372]: https://github.com/tokio-rs/tokio/pull/7372 +[#7389]: https://github.com/tokio-rs/tokio/pull/7389 +[#7393]: https://github.com/tokio-rs/tokio/pull/7393 +[#7394]: https://github.com/tokio-rs/tokio/pull/7394 +[#7416]: https://github.com/tokio-rs/tokio/pull/7416 +[#7422]: https://github.com/tokio-rs/tokio/pull/7422 +[#7426]: https://github.com/tokio-rs/tokio/pull/7426 +[#7429]: https://github.com/tokio-rs/tokio/pull/7429 +[#7417]: https://github.com/tokio-rs/tokio/pull/7417 + # 1.45.1 (May 24th, 2025) This fixes a regression on the wasm32-unknown-unknown target, where code that diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 8444de7a934..0b850350e98 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.45.1" +version = "1.46.0" edition = "2021" rust-version = "1.70" authors = ["Tokio Contributors "] diff --git a/tokio/README.md b/tokio/README.md index a01e6f4a7be..ef44167a1fc 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.45.1", features = ["full"] } +tokio = { version = "1.46.0", features = ["full"] } ``` Then, on your main.rs: From 824e377a51d007c626f1422e1f44c3152c90fe8c Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Tue, 1 Jul 2025 14:14:20 -0700 Subject: [PATCH 2/4] un-trail whitespace --- tokio/CHANGELOG.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index 26f3b55a041..b602770e7c8 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -2,7 +2,7 @@ ### Fixed -- net: fixed `TcpStream::shutdown` incorrectly returning an error on macOS +- net: fixed `TcpStream::shutdown` incorrectly returning an error on macOS ([#7290]) ## Added @@ -17,10 +17,10 @@ ## Changed -- runtime: eliminate unnecessary lfence while operating on `queue::Local` +- runtime: eliminate unnecessary lfence while operating on `queue::Local` ([#7340]) - task: disallow blocking in `LocalSet::{poll,drop}` ([#7372]) - + ## Unstable - runtime: add `TaskMeta::spawn_location` tracking where a task was spawned @@ -36,7 +36,7 @@ - net: fix broken link of `RawFd` in `TcpSocket` docs ([#7416]) - net: update `AsRawFd` doc link to current Rust stdlib location ([#7429]) - readme: fix double period in reactor description ([#7363]) -- runtime: add doc note that `on_*_task_poll` is unstable ([#7311]) +- runtime: add doc note that `on_*_task_poll` is unstable ([#7311]) - sync: update broadcast docs on allocation failure ([#7352]) - time: add a missing panic scenario of `time::advance` ([#7394]) From a8e0faf4ce1890374685e9d3743f8bfe78ce4c0c Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Tue, 1 Jul 2025 14:29:35 -0700 Subject: [PATCH 3/4] more whitespace --- tokio/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index b602770e7c8..c68efd9e117 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -27,7 +27,7 @@ ([#7417]) - runtime: removed borrow from `LocalOptions` parameter to `runtime::Builder::build_local` ([#7346]) - + ## Documented - io: clarify behavior of seeking when `start_seek` is not used ([#7366]) From 1393764e37fd26c6d7c4f63ee31529a3b0e4cb40 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Wed, 2 Jul 2025 07:35:44 +0200 Subject: [PATCH 4/4] Update date and formatting --- tokio/CHANGELOG.md | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index c68efd9e117..0e528581ce5 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,32 +1,26 @@ -# 1.46.0 (July 1st, 2025) +# 1.46.0 (July 2nd, 2025) ### Fixed -- net: fixed `TcpStream::shutdown` incorrectly returning an error on macOS - ([#7290]) +- net: fixed `TcpStream::shutdown` incorrectly returning an error on macOS ([#7290]) ## Added -- sync: `mpsc::OwnedPermit::{same_channel, same_channel_as_sender}` methods - ([#7389]) -- macros: `biased` option for `join!` and `try_join!`, similar to `select!` - ([#7307]) +- sync: `mpsc::OwnedPermit::{same_channel, same_channel_as_sender}` methods ([#7389]) +- macros: `biased` option for `join!` and `try_join!`, similar to `select!` ([#7307]) - net: support for cygwin ([#7393]) - net: support `pope::OpenOptions::read_write` on Android ([#7426]) - net: add `Clone` implementation for `net::unix::SocketAddr` ([#7422]) ## Changed -- runtime: eliminate unnecessary lfence while operating on `queue::Local` - ([#7340]) +- runtime: eliminate unnecessary lfence while operating on `queue::Local` ([#7340]) - task: disallow blocking in `LocalSet::{poll,drop}` ([#7372]) ## Unstable -- runtime: add `TaskMeta::spawn_location` tracking where a task was spawned - ([#7417]) -- runtime: removed borrow from `LocalOptions` parameter to - `runtime::Builder::build_local` ([#7346]) +- runtime: add `TaskMeta::spawn_location` tracking where a task was spawned ([#7417]) +- runtime: removed borrow from `LocalOptions` parameter to `runtime::Builder::build_local` ([#7346]) ## Documented