Remove deprecated pin_project items

This commit is contained in:
Henry de Valence 2020-06-16 13:56:18 -07:00
parent a0e0e2302b
commit b299fb7162
1 changed files with 5 additions and 7 deletions

View File

@ -2,7 +2,7 @@
use super::{error::Closed, message}; use super::{error::Closed, message};
use futures_core::ready; use futures_core::ready;
use pin_project::{pin_project, project}; use pin_project::pin_project;
use std::{ use std::{
future::Future, future::Future,
pin::Pin, pin::Pin,
@ -17,7 +17,7 @@ pub struct ResponseFuture<T> {
state: ResponseState<T>, state: ResponseState<T>,
} }
#[pin_project] #[pin_project(project = ResponseStateProj)]
#[derive(Debug)] #[derive(Debug)]
enum ResponseState<T> { enum ResponseState<T> {
Failed(Option<crate::BoxError>), Failed(Option<crate::BoxError>),
@ -46,22 +46,20 @@ where
{ {
type Output = Result<T, crate::BoxError>; type Output = Result<T, crate::BoxError>;
#[project]
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> { fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let mut this = self.project(); let mut this = self.project();
loop { loop {
#[project]
match this.state.as_mut().project() { match this.state.as_mut().project() {
ResponseState::Failed(e) => { ResponseStateProj::Failed(e) => {
return Poll::Ready(Err(e.take().expect("polled after error"))); 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(Ok(f)) => this.state.set(ResponseState::Poll(f)),
Ok(Err(e)) => return Poll::Ready(Err(e.into())), Ok(Err(e)) => return Poll::Ready(Err(e.into())),
Err(_) => return Poll::Ready(Err(Closed::new().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),
} }
} }
} }