From cc974a646bd3932c148e300a92fda387c23768dd Mon Sep 17 00:00:00 2001
From: Alice Ryhl <aliceryhl@google.com>
Date: Wed, 8 Jan 2025 16:56:31 +0100
Subject: [PATCH] chore: prepare tokio-macros v2.5.0 (#7078)

---
 tokio-macros/CHANGELOG.md | 6 ++++++
 tokio-macros/Cargo.toml   | 2 +-
 tokio/Cargo.toml          | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/tokio-macros/CHANGELOG.md b/tokio-macros/CHANGELOG.md
index 9b30d342e11..5dac1ff68ed 100644
--- a/tokio-macros/CHANGELOG.md
+++ b/tokio-macros/CHANGELOG.md
@@ -1,3 +1,9 @@
+# 2.5.0 (Jan 8th, 2025)
+
+- macros: suppress `clippy::needless_return` in `#[tokio::main]` ([#6874])
+
+[#6874]: https://github.com/tokio-rs/tokio/pull/6874
+
 # 2.4.0 (July 22nd, 2024)
 
 - msrv: increase MSRV to 1.70 ([#6645])
diff --git a/tokio-macros/Cargo.toml b/tokio-macros/Cargo.toml
index 26ff7001b73..e47e4116049 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.4.0"
+version = "2.5.0"
 edition = "2021"
 rust-version = "1.70"
 authors = ["Tokio Contributors <team@tokio.rs>"]
diff --git a/tokio/Cargo.toml b/tokio/Cargo.toml
index 4441864be66..2a452413b2f 100644
--- a/tokio/Cargo.toml
+++ b/tokio/Cargo.toml
@@ -86,7 +86,7 @@ test-util = ["rt", "sync", "time"]
 time = []
 
 [dependencies]
-tokio-macros = { version = "~2.4.0", path = "../tokio-macros", optional = true }
+tokio-macros = { version = "~2.5.0", path = "../tokio-macros", optional = true }
 
 pin-project-lite = "0.2.11"