From 49eb26f159c839fb34f4ce964759692443ca1302 Mon Sep 17 00:00:00 2001
From: Carl Lerche <me@carllerche.com>
Date: Thu, 9 Nov 2023 11:22:54 -0800
Subject: [PATCH] chore: prepare Tokio v1.34.0 release (#6138)

This also includes:
  - tokio-macros v2.2.0
---
 README.md                 |  2 +-
 tokio-macros/CHANGELOG.md |  8 ++++++++
 tokio-macros/Cargo.toml   |  2 +-
 tokio/CHANGELOG.md        | 28 +++++++++++++++++++++++++++-
 tokio/Cargo.toml          |  4 ++--
 tokio/README.md           |  2 +-
 6 files changed, 40 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 2bc5c194175..d73ff594c15 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.33.0", features = ["full"] }
+tokio = { version = "1.34.0", features = ["full"] }
 ```
 Then, on your main.rs:
 
diff --git a/tokio-macros/CHANGELOG.md b/tokio-macros/CHANGELOG.md
index e9d58db3c6e..32961394a09 100644
--- a/tokio-macros/CHANGELOG.md
+++ b/tokio-macros/CHANGELOG.md
@@ -1,3 +1,11 @@
+# 2.2.0 (November 19th, 2023)
+
+### Changed
+
+- use `::core` qualified imports instead of `::std` inside `tokio::test` macro ([#5973])
+
+[#5973]: https://github.com/tokio-rs/tokio/pull/5973
+
 # 2.1.0 (April 25th, 2023)
 
 - macros: fix typo in `#[tokio::test]` docs ([#5636])
diff --git a/tokio-macros/Cargo.toml b/tokio-macros/Cargo.toml
index 77069131a96..ea9839c6d06 100644
--- a/tokio-macros/Cargo.toml
+++ b/tokio-macros/Cargo.toml
@@ -4,7 +4,7 @@ name = "tokio-macros"
 # - Remove path dependencies
 # - Update CHANGELOG.md.
 # - Create "tokio-macros-1.x.y" git tag.
-version = "2.1.0"
+version = "2.2.0"
 edition = "2021"
 rust-version = "1.63"
 authors = ["Tokio Contributors <team@tokio.rs>"]
diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index d745ad66056..e21d1c1d4f9 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -1,4 +1,30 @@
-[comment]: <> (Include tokio-macros changes in next release.)
+# 1.34.0 (November 19th, 2023)
+
+### Fixed
+
+- io: allow `clear_readiness` after io driver shutdown ([#6067])
+- io: fix integer overflow in `take` ([#6080])
+- io: fix I/O resource hang ([#6134])
+- sync: fix `broadcast::channel` link ([#6100])
+
+### Changed
+
+- macros: use `::core` qualified imports instead of `::std` inside `tokio::test` macro ([#5973])
+
+### Added
+
+- fs: update cfg attr in `fs::read_dir` to include `aix` ([#6075])
+- sync: add `mpsc::Receiver::recv_many` ([#6010])
+- tokio: added vita target support ([#6094])
+
+[#5973]: https://github.com/tokio-rs/tokio/pull/5973
+[#6067]: https://github.com/tokio-rs/tokio/pull/6067
+[#6080]: https://github.com/tokio-rs/tokio/pull/6080
+[#6134]: https://github.com/tokio-rs/tokio/pull/6134
+[#6100]: https://github.com/tokio-rs/tokio/pull/6100
+[#6075]: https://github.com/tokio-rs/tokio/pull/6075
+[#6010]: https://github.com/tokio-rs/tokio/pull/6010
+[#6094]: https://github.com/tokio-rs/tokio/pull/6094
 
 # 1.33.0 (October 9, 2023)
 
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index b9599cc424a..4c4402227a2 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.33.0"
+version = "1.34.0"
 edition = "2021"
 rust-version = "1.63"
 authors = ["Tokio Contributors <team@tokio.rs>"]
@@ -89,7 +89,7 @@ test-util = ["rt", "sync", "time"]
 time = []
 
 [dependencies]
-tokio-macros = { version = "~2.1.0", path = "../tokio-macros", optional = true }
+tokio-macros = { version = "~2.2.0", path = "../tokio-macros", optional = true }
 
 pin-project-lite = "0.2.11"
 
diff --git a/tokio/README.md b/tokio/README.md
index 2bc5c194175..d73ff594c15 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.33.0", features = ["full"] }
+tokio = { version = "1.34.0", features = ["full"] }
 ```
 Then, on your main.rs: