From e0be45e49b81a69526657b8060a434948dd39e60 Mon Sep 17 00:00:00 2001 From: Eliza Weisman Date: Mon, 15 Nov 2021 16:09:33 -0800 Subject: [PATCH] Merge v1.13.1 (#4236) Refs: #4235 --- README.md | 2 +- tokio/CHANGELOG.md | 9 +++++++++ tokio/Cargo.toml | 4 ++-- tokio/README.md | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c40cd0f2f..28707a0b9 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.13.0", features = ["full"] } +tokio = { version = "1.13.1", features = ["full"] } ``` Then, on your main.rs: diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md index 0bec0d5e8..8b1ffac2c 100644 --- a/tokio/CHANGELOG.md +++ b/tokio/CHANGELOG.md @@ -1,3 +1,12 @@ +# 1.13.1 (November 15, 2021) + +### Fixed + +- sync: fix a data race between `oneshot::Sender::send` and awaiting a + `oneshot::Receiver` when the oneshot has been closed ([#4226]) + +[#4226]: https://github.com/tokio-rs/tokio/pull/4226 + # 1.13.0 (October 29, 2021) ### Fixed diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index fdd7e34ea..c615285f8 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -7,12 +7,12 @@ name = "tokio" # - README.md # - Update CHANGELOG.md. # - Create "v1.0.x" git tag. -version = "1.13.0" +version = "1.13.1" edition = "2018" authors = ["Tokio Contributors "] license = "MIT" readme = "README.md" -documentation = "https://docs.rs/tokio/1.13.0/tokio/" +documentation = "https://docs.rs/tokio/1.13.1/tokio/" repository = "https://github.com/tokio-rs/tokio" homepage = "https://tokio.rs" description = """ diff --git a/tokio/README.md b/tokio/README.md index c40cd0f2f..28707a0b9 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.13.0", features = ["full"] } +tokio = { version = "1.13.1", features = ["full"] } ``` Then, on your main.rs: