From e4e440906dc93af92dabca63f97af7bd2bf0b31b Mon Sep 17 00:00:00 2001
From: Eliza Weisman <eliza@buoyant.io>
Date: Fri, 11 Mar 2022 09:51:00 -0800
Subject: [PATCH] util: remove deprecated `ServiceExt::ready_and` (#652)

These were deprecated in #567. In 0.5, we can just remove them
entirely.

Closes #568

Signed-off-by: Eliza Weisman <eliza@buoyant.io>
---
 tower/CHANGELOG.md      |  8 +++++++-
 tower/src/util/mod.rs   | 16 +---------------
 tower/src/util/ready.rs |  8 --------
 3 files changed, 8 insertions(+), 24 deletions(-)

diff --git a/tower/CHANGELOG.md b/tower/CHANGELOG.md
index 4a055ec4..5bdc7e3d 100644
--- a/tower/CHANGELOG.md
+++ b/tower/CHANGELOG.md
@@ -7,7 +7,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 # Unreleased
 
-- None.
+### Changed
+
+- **util**: Removed deprecated `ServiceExt::ready_and` method and `ReadyAnd`
+  future ([#652])
+
+
+[#652]: https://github.com/tower-rs/tower/pull/652
 
 # 0.4.12 (February 16, 2022)
 
diff --git a/tower/src/util/mod.rs b/tower/src/util/mod.rs
index 7e34b65c..dddf8ed7 100644
--- a/tower/src/util/mod.rs
+++ b/tower/src/util/mod.rs
@@ -19,7 +19,6 @@ mod ready;
 mod service_fn;
 mod then;
 
-#[allow(deprecated)]
 pub use self::{
     and_then::{AndThen, AndThenLayer},
     boxed::{BoxLayer, BoxService, UnsyncBoxService},
@@ -33,7 +32,7 @@ pub use self::{
     map_result::{MapResult, MapResultLayer},
     oneshot::Oneshot,
     optional::Optional,
-    ready::{Ready, ReadyAnd, ReadyOneshot},
+    ready::{Ready, ReadyOneshot},
     service_fn::{service_fn, ServiceFn},
     then::{Then, ThenLayer},
 };
@@ -72,19 +71,6 @@ pub trait ServiceExt<Request>: tower_service::Service<Request> {
         Ready::new(self)
     }
 
-    /// Yields a mutable reference to the service when it is ready to accept a request.
-    #[deprecated(
-        since = "0.4.6",
-        note = "please use the `ServiceExt::ready` method instead"
-    )]
-    #[allow(deprecated)]
-    fn ready_and(&mut self) -> ReadyAnd<'_, Self, Request>
-    where
-        Self: Sized,
-    {
-        ReadyAnd::new(self)
-    }
-
     /// Yields the service when it is ready to accept a request.
     fn ready_oneshot(self) -> ReadyOneshot<Self, Request>
     where
diff --git a/tower/src/util/ready.rs b/tower/src/util/ready.rs
index 8b0fe2c8..668d5014 100644
--- a/tower/src/util/ready.rs
+++ b/tower/src/util/ready.rs
@@ -69,14 +69,6 @@ where
 /// [`ServiceExt::ready`]: crate::util::ServiceExt::ready
 pub struct Ready<'a, T, Request>(ReadyOneshot<&'a mut T, Request>);
 
-/// A future that yields a mutable reference to the service when it is ready to accept a request.
-///
-/// [`ReadyAnd`] values are produced by [`ServiceExt::ready_and`].
-///
-/// [`ServiceExt::ready_and`]: crate::util::ServiceExt::ready_and
-#[deprecated(since = "0.4.6", note = "Please use the Ready future instead")]
-pub type ReadyAnd<'a, T, Request> = Ready<'a, T, Request>;
-
 // Safety: This is safe for the same reason that the impl for ReadyOneshot is safe.
 impl<'a, T, Request> Unpin for Ready<'a, T, Request> {}