From dd8fc2bf139c2023a71b8e8ebe5c31ed549805fc Mon Sep 17 00:00:00 2001
From: Alice Ryhl <aliceryhl@google.com>
Date: Fri, 3 Jun 2022 14:42:44 +0200
Subject: [PATCH 1/3] chore: prepare Tokio v1.19.0

---
 README.md          |  2 +-
 tokio/CHANGELOG.md | 50 ++++++++++++++++++++++++++++++++++++++++++++++
 tokio/Cargo.toml   |  2 +-
 tokio/README.md    |  2 +-
 4 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 6cc40afd127..ea1edaceacc 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.18.2", features = ["full"] }
+tokio = { version = "1.19.0", features = ["full"] }
 ```
 Then, on your main.rs:
 
diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index ffdcaaa31a1..d69678285ba 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -1,3 +1,53 @@
+# 1.19.0 (June 3, 2022)
+
+### Added
+
+- runtime: add `is_finished` method for `JoinHandle` and `AbortHandle` ([#4709])
+- runtime: make global queue and event polling intervals configurable ([#4671])
+- sync: add `Notified::enable` ([#4705])
+- sync: add `watch::Sender::send_if_modified` ([#4591])
+- sync: add resubscribe method to broadcast::Receiver ([#4607])
+
+### Changed
+
+- io: refactor out usage of Weak in the io handle ([#4656])
+- metrics: correctly update atomics in `IoDriverMetrics` ([#4725])
+
+### Fixed
+
+- macros: avoid starvation in `join!` and `try_join!` ([#4624])
+- metrics: fix compilation with unstable, process, and rt, but without net ([#4682])
+
+### Documented
+
+- runtime: clarify semantics of tasks outliving `block_on` ([#4729])
+- time: fix example for `MissedTickBehavior::Burst` ([#4713])
+
+### Unstable
+
+- task: add `#[track_caller]` to `JoinSet`/`JoinMap` ([#4697])
+- task: add `Builder::{spawn_on, spawn_local_on, spawn_blocking_on}` ([#4683])
+- task: add `consume_budget` for cooperative scheduling ([#4498])
+- task: add `join_set::Builder` for configuring `JoinSet` tasks ([#4687])
+- task: update return value of `JoinSet::join_one` ([#4726])
+
+[#4498]: https://github.com/tokio-rs/tokio/pull/4498
+[#4591]: https://github.com/tokio-rs/tokio/pull/4591
+[#4607]: https://github.com/tokio-rs/tokio/pull/4607
+[#4624]: https://github.com/tokio-rs/tokio/pull/4624
+[#4656]: https://github.com/tokio-rs/tokio/pull/4656
+[#4671]: https://github.com/tokio-rs/tokio/pull/4671
+[#4682]: https://github.com/tokio-rs/tokio/pull/4682
+[#4683]: https://github.com/tokio-rs/tokio/pull/4683
+[#4687]: https://github.com/tokio-rs/tokio/pull/4687
+[#4697]: https://github.com/tokio-rs/tokio/pull/4697
+[#4705]: https://github.com/tokio-rs/tokio/pull/4705
+[#4709]: https://github.com/tokio-rs/tokio/pull/4709
+[#4713]: https://github.com/tokio-rs/tokio/pull/4713
+[#4725]: https://github.com/tokio-rs/tokio/pull/4725
+[#4726]: https://github.com/tokio-rs/tokio/pull/4726
+[#4729]: https://github.com/tokio-rs/tokio/pull/4729
+
 # 1.18.2 (May 5, 2022)
 
 Add missing features for the `winapi` dependency. ([#4663])
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index 71aa8e2b6a0..d1f447f2b8e 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -6,7 +6,7 @@ name = "tokio"
 #   - README.md
 # - Update CHANGELOG.md.
 # - Create "v1.0.x" git tag.
-version = "1.18.2"
+version = "1.19.0"
 edition = "2018"
 rust-version = "1.49"
 authors = ["Tokio Contributors <team@tokio.rs>"]
diff --git a/tokio/README.md b/tokio/README.md
index 6cc40afd127..ea1edaceacc 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.18.2", features = ["full"] }
+tokio = { version = "1.19.0", features = ["full"] }
 ```
 Then, on your main.rs:
 

From 1f13ba9a3386852ef9a6cd85ab492d21e681875d Mon Sep 17 00:00:00 2001
From: Alice Ryhl <aliceryhl@google.com>
Date: Fri, 3 Jun 2022 18:22:47 +0200
Subject: [PATCH 2/3] Move metrics to unstable

---
 tokio/CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index d69678285ba..79e78021316 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -11,12 +11,10 @@
 ### Changed
 
 - io: refactor out usage of Weak in the io handle ([#4656])
-- metrics: correctly update atomics in `IoDriverMetrics` ([#4725])
 
 ### Fixed
 
 - macros: avoid starvation in `join!` and `try_join!` ([#4624])
-- metrics: fix compilation with unstable, process, and rt, but without net ([#4682])
 
 ### Documented
 
@@ -25,6 +23,8 @@
 
 ### Unstable
 
+- metrics: correctly update atomics in `IoDriverMetrics` ([#4725])
+- metrics: fix compilation with unstable, process, and rt, but without net ([#4682])
 - task: add `#[track_caller]` to `JoinSet`/`JoinMap` ([#4697])
 - task: add `Builder::{spawn_on, spawn_local_on, spawn_blocking_on}` ([#4683])
 - task: add `consume_budget` for cooperative scheduling ([#4498])

From 85914baa8990d2d29e5de66f8f99781f70adc573 Mon Sep 17 00:00:00 2001
From: Alice Ryhl <aliceryhl@google.com>
Date: Fri, 3 Jun 2022 19:53:04 +0200
Subject: [PATCH 3/3] Add PR I just merged to changelog

---
 tokio/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tokio/CHANGELOG.md b/tokio/CHANGELOG.md
index 79e78021316..78e47385ba2 100644
--- a/tokio/CHANGELOG.md
+++ b/tokio/CHANGELOG.md
@@ -7,6 +7,7 @@
 - sync: add `Notified::enable` ([#4705])
 - sync: add `watch::Sender::send_if_modified` ([#4591])
 - sync: add resubscribe method to broadcast::Receiver ([#4607])
+- net: add `take_error` to `TcpSocket and `TcpStream` ([#4739])
 
 ### Changed
 
@@ -47,6 +48,7 @@
 [#4725]: https://github.com/tokio-rs/tokio/pull/4725
 [#4726]: https://github.com/tokio-rs/tokio/pull/4726
 [#4729]: https://github.com/tokio-rs/tokio/pull/4729
+[#4739]: https://github.com/tokio-rs/tokio/pull/4739
 
 # 1.18.2 (May 5, 2022)