refactor(client,service): remove tower_service::Service where possible

tomkarw · tomkarw · commit 9ba318440bb7 · 2022-07-27T22:11:28.000+02:00
diff --git a/examples/service_struct_impl.rs b/examples/service_struct_impl.rs
@@ -27,10 +27,6 @@ impl Service<Request<Body>> for Svc {
     type Error = hyper::Error;
     type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
 
-    fn poll_ready(&mut self, _: &mut Context) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
-
     fn call(&mut self, req: Request<Body>) -> Self::Future {
         fn mk_response(s: String) -> Result<Response<Body>, hyper::Error> {
             Ok(Response::builder().body(Body::from(s)).unwrap())
@@ -64,10 +60,6 @@ impl<T> Service<T> for MakeSvc {
     type Error = hyper::Error;
     type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
 
-    fn poll_ready(&mut self, _: &mut Context) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
-
     fn call(&mut self, _: T) -> Self::Future {
         let counter = self.counter.clone();
         let fut = async move { Ok(Svc { counter }) };
diff --git a/examples/tower_client.rs b/examples/tower_client.rs
diff --git a/examples/tower_server.rs b/examples/tower_server.rs
diff --git a/src/client/conn/mod.rs b/src/client/conn/mod.rs
@@ -67,7 +67,6 @@ use futures_util::future::{self, Either, FutureExt as _};
 use httparse::ParserConfig;
 use pin_project_lite::pin_project;
 use tokio::io::{AsyncRead, AsyncWrite};
-use tower_service::Service;
 use tracing::{debug, trace};
 
 use super::dispatch;
@@ -83,6 +82,7 @@ use crate::rt::Executor;
 #[cfg(feature = "http1")]
 use crate::upgrade::Upgraded;
 use crate::{Body, Request, Response};
+use crate::service::Service;
 
 #[cfg(feature = "http1")]
 pub mod http1;
@@ -352,10 +352,6 @@ where
     type Error = crate::Error;
     type Future = ResponseFuture;
 
-    fn poll_ready(&mut self, cx: &mut task::Context<'_>) -> Poll<Result<(), Self::Error>> {
-        self.poll_ready(cx)
-    }
-
     fn call(&mut self, req: Request<B>) -> Self::Future {
         self.send_request(req)
     }
diff --git a/src/service/util.rs b/src/service/util.rs
@@ -3,7 +3,8 @@ use std::fmt;
 use std::marker::PhantomData;
 
 use crate::body::HttpBody;
-use crate::common::{task, Future, Poll};
+use crate::common::Future;
+use crate::service::Service;
 use crate::{Request, Response};
 
 /// Create a `Service` from a function.
@@ -41,8 +42,7 @@ pub struct ServiceFn<F, R> {
     _req: PhantomData<fn(R)>,
 }
 
-impl<F, ReqBody, Ret, ResBody, E> tower_service::Service<crate::Request<ReqBody>>
-    for ServiceFn<F, ReqBody>
+impl<F, ReqBody, Ret, ResBody, E> Service<crate::Request<ReqBody>> for ServiceFn<F, ReqBody>
 where
     F: FnMut(Request<ReqBody>) -> Ret,
     ReqBody: HttpBody,
@@ -54,10 +54,6 @@ where
     type Error = E;
     type Future = Ret;
 
-    fn poll_ready(&mut self, _cx: &mut task::Context<'_>) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Ok(()))
-    }
-
     fn call(&mut self, req: Request<ReqBody>) -> Self::Future {
         (self.f)(req)
     }
diff --git a/tests/server.rs b/tests/server.rs
@@ -28,7 +28,7 @@ use hyper::body::HttpBody as _;
 use hyper::client::Client;
 use hyper::server::conn::Http;
 use hyper::server::Server;
-use hyper::service::{make_service_fn, service_fn};
+use hyper::service::{make_service_fn, service_fn, Service};
 use hyper::{Body, Request, Response, StatusCode, Version};
 
 mod support;
@@ -2335,7 +2335,7 @@ fn http2_body_user_error_sends_reset_reason() {
 
 struct Http2ReadyErrorSvc;
 
-impl tower_service::Service<Request<Body>> for Http2ReadyErrorSvc {
+impl Service<Request<Body>> for Http2ReadyErrorSvc {
     type Response = Response<Body>;
     type Error = h2::Error;
     type Future = Box<
@@ -2345,12 +2345,6 @@ impl tower_service::Service<Request<Body>> for Http2ReadyErrorSvc {
             + Unpin,
     >;
 
-    fn poll_ready(&mut self, _: &mut std::task::Context<'_>) -> Poll<Result<(), Self::Error>> {
-        Poll::Ready(Err::<(), _>(h2::Error::from(
-            h2::Reason::INADEQUATE_SECURITY,
-        )))
-    }
-
     fn call(&mut self, _: hyper::Request<Body>) -> Self::Future {
         unreachable!("poll_ready error should have shutdown conn");
     }
@@ -2798,15 +2792,11 @@ enum Msg {
     End,
 }
 
-impl tower_service::Service<Request<Body>> for TestService {
+impl Service<Request<Body>> for TestService {
     type Response = Response<ReplyBody>;
     type Error = BoxError;
     type Future = BoxFuture;
 
-    fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        Ok(()).into()
-    }
-
     fn call(&mut self, mut req: Request<Body>) -> Self::Future {
         let tx = self.tx.clone();
         let replies = self.reply.clone();
@@ -2865,22 +2855,18 @@ const HELLO: &str = "hello";
 
 struct HelloWorld;
 
-impl tower_service::Service<Request<Body>> for HelloWorld {
+impl Service<Request<Body>> for HelloWorld {
     type Response = Response<Body>;
     type Error = hyper::Error;
     type Future = future::Ready<Result<Response<Body>, Self::Error>>;
 
-    fn poll_ready(&mut self, _cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
-        Ok(()).into()
-    }
-
     fn call(&mut self, _req: Request<Body>) -> Self::Future {
         let response = Response::new(HELLO.into());
         future::ok(response)
     }
 }
 
-fn unreachable_service() -> impl tower_service::Service<
+fn unreachable_service() -> impl Service<
     http::Request<hyper::Body>,
     Response = http::Response<ReplyBody>,
     Error = BoxError,
