From 4a45ccf16fd48e5cda91ba2bd9b421ae678e6a2d Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Fri, 24 Mar 2023 12:54:57 +0100 Subject: [PATCH 1/4] chore: prepare tokio-macros v2.0.0 --- tokio-macros/CHANGELOG.md | 16 ++++++++++++++++ tokio-macros/Cargo.toml | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/tokio-macros/CHANGELOG.md b/tokio-macros/CHANGELOG.md index 93d52e739de..f8cd82f1fa6 100644 --- a/tokio-macros/CHANGELOG.md +++ b/tokio-macros/CHANGELOG.md @@ -1,3 +1,19 @@ +# 2.0.0 (March 24th, 2023) + +This major release updates the dependency on the syn crate to 2.0.0, and +increases the MSRV to 1.56. + +As part of this release, we are adopting a policy of incrementing the +tokio-macros major version more often. This reduces the chance of issues where +people are confused about the same version of Tokio not behaving in the same +way, if you happen to be using two different versions of tokio-macros. + +- macros: update `syn` ([#5572]) +- macros: accept path as crate rename ([#5557]) + +[#5572]: https://github.com/tokio-rs/tokio/pull/5572 +[#5557]: https://github.com/tokio-rs/tokio/pull/5557 + # 1.8.2 (November 30th, 2022) - fix a regression introduced in 1.8.1 ([#5244]) diff --git a/tokio-macros/Cargo.toml b/tokio-macros/Cargo.toml index bec401c08a0..291da3c8836 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 = "1.8.2" +version = "2.0.0" edition = "2018" rust-version = "1.56" authors = ["Tokio Contributors "] From 00850b65c3bc9e177244c1c3ae7f71a1deaf7915 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Fri, 24 Mar 2023 13:05:29 +0100 Subject: [PATCH 2/4] Update tokio dependency --- tokio/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 450a59cc425..496cce51249 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -97,7 +97,7 @@ stats = [] autocfg = "1.1" [dependencies] -tokio-macros = { version = "1.7.0", path = "../tokio-macros", optional = true } +tokio-macros = { version = "2.0.0", path = "../tokio-macros", optional = true } pin-project-lite = "0.2.0" From d12f820011c126e5e977f5e5292eb62433132158 Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Sat, 25 Mar 2023 13:50:33 +0100 Subject: [PATCH 3/4] Update tokio-macros dependency --- tokio/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml index 496cce51249..632ae0518de 100644 --- a/tokio/Cargo.toml +++ b/tokio/Cargo.toml @@ -97,7 +97,7 @@ stats = [] autocfg = "1.1" [dependencies] -tokio-macros = { version = "2.0.0", path = "../tokio-macros", optional = true } +tokio-macros = { version = "~2.0.0", path = "../tokio-macros", optional = true } pin-project-lite = "0.2.0" From 663b826094eba6191449cd4a418a6ae856b5507c Mon Sep 17 00:00:00 2001 From: Alice Ryhl Date: Sat, 25 Mar 2023 13:53:19 +0100 Subject: [PATCH 4/4] Fix CHANGELOG --- tokio-macros/CHANGELOG.md | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tokio-macros/CHANGELOG.md b/tokio-macros/CHANGELOG.md index f8cd82f1fa6..2acf402a24b 100644 --- a/tokio-macros/CHANGELOG.md +++ b/tokio-macros/CHANGELOG.md @@ -3,10 +3,9 @@ This major release updates the dependency on the syn crate to 2.0.0, and increases the MSRV to 1.56. -As part of this release, we are adopting a policy of incrementing the -tokio-macros major version more often. This reduces the chance of issues where -people are confused about the same version of Tokio not behaving in the same -way, if you happen to be using two different versions of tokio-macros. +As part of this release, we are adopting a policy of depending on a specific minor +release of tokio-macros. This prevents Tokio from being able to pull in many different +versions of tokio-macros. - macros: update `syn` ([#5572]) - macros: accept path as crate rename ([#5557])