From b299fb7162239b3b74fbc2930849c24de52fc0c8 Mon Sep 17 00:00:00 2001 From: Henry de Valence Date: Tue, 16 Jun 2020 13:56:18 -0700 Subject: [PATCH] Remove deprecated pin_project items --- tower-batch/src/future.rs | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/tower-batch/src/future.rs b/tower-batch/src/future.rs index cd1292ba..ed96ce3f 100644 --- a/tower-batch/src/future.rs +++ b/tower-batch/src/future.rs @@ -2,7 +2,7 @@ use super::{error::Closed, message}; use futures_core::ready; -use pin_project::{pin_project, project}; +use pin_project::pin_project; use std::{ future::Future, pin::Pin, @@ -17,7 +17,7 @@ pub struct ResponseFuture { state: ResponseState, } -#[pin_project] +#[pin_project(project = ResponseStateProj)] #[derive(Debug)] enum ResponseState { Failed(Option), @@ -46,22 +46,20 @@ where { type Output = Result; - #[project] fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll { let mut this = self.project(); loop { - #[project] match this.state.as_mut().project() { - ResponseState::Failed(e) => { + ResponseStateProj::Failed(e) => { return Poll::Ready(Err(e.take().expect("polled after error"))); } - ResponseState::Rx(rx) => match ready!(rx.poll(cx)) { + ResponseStateProj::Rx(rx) => match ready!(rx.poll(cx)) { Ok(Ok(f)) => this.state.set(ResponseState::Poll(f)), Ok(Err(e)) => return Poll::Ready(Err(e.into())), Err(_) => return Poll::Ready(Err(Closed::new().into())), }, - ResponseState::Poll(fut) => return fut.poll(cx).map_err(Into::into), + ResponseStateProj::Poll(fut) => return fut.poll(cx).map_err(Into::into), } } }