Remove Boxing

Waiting on rust-lang/rust#63063.
tower-rs · May 4, 2020 · 346858d · 346858d
1 parent d083aab
commit 346858d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -140,6 +140,7 @@
  rust_2018_idioms
 )]
 #![allow(clippy::type_complexity)]
+#![feature(type_alias_impl_trait)]
 
 const YIELD_EVERY: usize = 24;
 

diff --git a/src/multiplex/client.rs b/src/multiplex/client.rs
@@ -93,11 +93,11 @@ where
 {
  type Error = SpawnError<NT::MakeError>;
  type Response = Client<NT::Transport, Error<NT::Transport, Request>, Request>;
- type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
+ type Future = impl Future<Output = Result<Self::Response, Self::Error>> + Send;
 
  fn call(&mut self, target: Target) -> Self::Future {
  let maker = self.t_maker.make_transport(target);
- Box::pin(async move { Ok(Client::new(maker.await.map_err(SpawnError::Inner)?)) })
+ async move { Ok(Client::new(maker.await.map_err(SpawnError::Inner)?)) }
  }
 
  fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
@@ -390,7 +390,7 @@ where
 {
  type Response = T::Ok;
  type Error = E;
- type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
+ type Future = impl Future<Output = Result<Self::Response, Self::Error>> + Send;
 
  fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), E>> {
  Poll::Ready(ready!(self.mediator.poll_ready(cx)).map_err(|_| E::from(Error::ClientDropped)))
@@ -402,7 +402,7 @@ where
  tracing::trace!("issuing request");
  let req = ClientRequest { req, span, res: tx };
  let r = self.mediator.try_send(req);
- Box::pin(async move {
+ async move {
  match r {
  Ok(()) => match rx.await {
  Ok(r) => {
@@ -413,7 +413,7 @@ where
  },
  Err(_) => Err(E::from(Error::TransportFull)),
  }
- })
+ }
  }
 }
 

diff --git a/src/pipeline/client.rs b/src/pipeline/client.rs
@@ -72,11 +72,11 @@ where
 {
  type Error = SpawnError<NT::MakeError>;
  type Response = Client<NT::Transport, Error<NT::Transport, Request>, Request>;
- type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
+ type Future = impl Future<Output = Result<Self::Response, Self::Error>> + Send;
 
  fn call(&mut self, target: Target) -> Self::Future {
  let maker = self.t_maker.make_transport(target);
- Box::pin(async move { Ok(Client::new(maker.await.map_err(SpawnError::Inner)?)) })
+ async move { Ok(Client::new(maker.await.map_err(SpawnError::Inner)?)) }
  }
 
  fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
@@ -350,7 +350,7 @@ where
 {
  type Response = T::Ok;
  type Error = E;
- type Future = Pin<Box<dyn Future<Output = Result<Self::Response, Self::Error>> + Send>>;
+ type Future = impl Future<Output = Result<Self::Response, Self::Error>> + Send;
 
  fn poll_ready(&mut self, cx: &mut Context<'_>) -> Poll<Result<(), E>> {
  Poll::Ready(ready!(self.mediator.poll_ready(cx)).map_err(|_| E::from(Error::ClientDropped)))
@@ -362,7 +362,7 @@ where
  tracing::trace!("issuing request");
  let req = ClientRequest { req, span, res: tx };
  let r = self.mediator.try_send(req);
- Box::pin(async move {
+ async move {
  match r {
  Ok(()) => match rx.await {
  Ok(r) => {
@@ -373,7 +373,7 @@ where
  },
  Err(_) => Err(E::from(Error::TransportFull)),
  }
- })
+ }
  }
 }