mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 13:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

upgrade pin-project

Browse source
This commit is contained in:
Nikolay Kim 2020-06-15 11:33:16 +06:00
parent f3ab3a738c
commit c5f96972b9
14 changed files with 73 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-service/CHANGES.md
View file

@ -1,5 +1,9 @@
# Changes
## [0.1.3] - 2020-04-15
* Upgrade pin-project
## [0.1.2] - 2020-04-27
* Check ready state for map_config_service

5
ntex-service/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-service"
version = "0.1.2"
version = "0.1.3"
authors = ["Nikolay Kim <fafhrd91@gmail.com>"]
description = "ntex service"
keywords = ["network", "framework", "async", "futures"]
@ -17,7 +17,8 @@ path = "src/lib.rs"
[dependencies]
futures-util = "0.3.4"
pin-project = "0.4.8"
pin-project = "0.4.20"
pin-project-lite = "0.1.5"
[dev-dependencies]
ntex-rt = "0.1"

16
ntex-service/src/and_then.rs
View file

@ -68,7 +68,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub(crate) struct AndThenServiceResponse<A, B>
where
A: Service,
@ -77,8 +77,9 @@ where
#[pin]
state: State<A, B>,
}
}
#[pin_project::pin_project]
#[pin_project::pin_project(project = StateProject)]
enum State<A, B>
where
A: Service,
@ -96,13 +97,11 @@ where
{
type Output = Result<B::Response, A::Error>;
#[pin_project::project]
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let mut this = self.as_mut().project();
#[project]
match this.state.as_mut().project() {
State::A(fut, b) => match fut.poll(cx)? {
StateProject::A(fut, b) => match fut.poll(cx)? {
Poll::Ready(res) => {
let b = b.take().unwrap();
this.state.set(State::Empty); // drop fut A
@ -112,11 +111,11 @@ where
}
Poll::Pending => Poll::Pending,
},
State::B(fut) => fut.poll(cx).map(|r| {
StateProject::B(fut) => fut.poll(cx).map(|r| {
this.state.set(State::Empty);
r
}),
State::Empty => {
StateProject::Empty => {
panic!("future must not be polled after it returned `Poll::Ready`")
}
}
@ -204,7 +203,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub(crate) struct AndThenServiceFactoryResponse<A, B>
where
A: ServiceFactory,
@ -218,6 +217,7 @@ where
a: Option<A::Service>,
b: Option<B::Service>,
}
}
impl<A, B> AndThenServiceFactoryResponse<A, B>
where

18
ntex-service/src/and_then_apply_fn.rs
View file

@ -95,7 +95,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub(crate) struct AndThenApplyFnFuture<A, B, F, Fut, Res, Err>
where
A: Service,
@ -108,8 +108,9 @@ where
#[pin]
state: State<A, B, F, Fut, Res, Err>,
}
}
#[pin_project::pin_project]
#[pin_project::pin_project(project = StateProject)]
enum State<A, B, F, Fut, Res, Err>
where
A: Service,
@ -134,13 +135,11 @@ where
{
type Output = Result<Res, Err>;
#[pin_project::project]
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let mut this = self.as_mut().project();
#[project]
match this.state.as_mut().project() {
State::A(fut, b) => match fut.poll(cx)? {
StateProject::A(fut, b) => match fut.poll(cx)? {
Poll::Ready(res) => {
let b = b.take().unwrap();
this.state.set(State::Empty);
@ -151,11 +150,11 @@ where
}
Poll::Pending => Poll::Pending,
},
State::B(fut) => fut.poll(cx).map(|r| {
StateProject::B(fut) => fut.poll(cx).map(|r| {
this.state.set(State::Empty);
r
}),
State::Empty => {
StateProject::Empty => {
panic!("future must not be polled after it returned `Poll::Ready`")
}
}
@ -224,12 +223,12 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub(crate) struct AndThenApplyFnFactoryResponse<A, B, F, Fut, Res, Err>
where
A: ServiceFactory,
B: ServiceFactory<Config = A::Config, InitError = A::InitError>,
F: Fn(A::Response, &B::Service) -> Fut + Clone,
F: Fn(A::Response, &B::Service) -> Fut,
Fut: Future<Output = Result<Res, Err>>,
Err: From<A::Error>,
Err: From<B::Error>,
@ -242,6 +241,7 @@ where
a: Option<A::Service>,
b: Option<B::Service>,
}
}
impl<A, B, F, Fut, Res, Err> Future
for AndThenApplyFnFactoryResponse<A, B, F, Fut, Res, Err>

3
ntex-service/src/apply.rs
View file

@ -164,7 +164,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub struct ApplyServiceFactoryResponse<T, F, R, In, Out, Err>
where
T: ServiceFactory<Error = Err>,
@ -176,6 +176,7 @@ where
f: Option<F>,
r: PhantomData<(In, Out)>,
}
}
impl<T, F, R, In, Out, Err> ApplyServiceFactoryResponse<T, F, R, In, Out, Err>
where

13
ntex-service/src/apply_cfg.rs
View file

@ -160,7 +160,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
struct ApplyConfigServiceFactoryResponse<F, C, T, R, S>
where
F: Fn(C, &T::Service) -> R,
@ -174,8 +174,9 @@ where
#[pin]
state: State<T, R, S>,
}
}
#[pin_project::pin_project]
#[pin_project::pin_project(project = StateProject)]
enum State<T, R, S>
where
T: ServiceFactory<Config = ()>,
@ -198,20 +199,18 @@ where
{
type Output = Result<S, T::InitError>;
#[pin_project::project]
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let mut this = self.as_mut().project();
#[project]
match this.state.as_mut().project() {
State::A(fut) => match fut.poll(cx)? {
StateProject::A(fut) => match fut.poll(cx)? {
Poll::Pending => Poll::Pending,
Poll::Ready(srv) => {
this.state.set(State::B(srv));
self.poll(cx)
}
},
State::B(srv) => match srv.poll_ready(cx)? {
StateProject::B(srv) => match srv.poll_ready(cx)? {
Poll::Ready(_) => {
let fut = (this.store.as_ref().1)(this.cfg.take().unwrap(), srv);
this.state.set(State::C(fut));
@ -219,7 +218,7 @@ where
}
Poll::Pending => Poll::Pending,
},
State::C(fut) => fut.poll(cx),
StateProject::C(fut) => fut.poll(cx),
}
}
}

22
ntex-service/src/map.rs
View file

@ -70,7 +70,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub struct MapFuture<A, F, Response>
where
A: Service,
@ -80,6 +80,7 @@ where
#[pin]
fut: A::Future,
}
}
impl<A, F, Response> MapFuture<A, F, Response>
where
@ -166,15 +167,16 @@ where
}
}
#[pin_project::pin_project]
pub struct MapServiceFuture<A, F, Res>
where
A: ServiceFactory,
F: FnMut(A::Response) -> Res,
{
#[pin]
fut: A::Future,
f: Option<F>,
pin_project_lite::pin_project! {
pub struct MapServiceFuture<A, F, Res>
where
A: ServiceFactory,
F: FnMut(A::Response) -> Res,
{
#[pin]
fut: A::Future,
f: Option<F>,
}
}
impl<A, F, Res> MapServiceFuture<A, F, Res>

15
ntex-service/src/map_config.rs
View file

@ -230,7 +230,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub struct MapConfigServiceResponse<A, M: ServiceFactory, C>
where
A: ServiceFactory,
@ -241,8 +241,9 @@ where
#[pin]
state: ResponseState<A, M>,
}
}
#[pin_project::pin_project]
#[pin_project::pin_project(project = ResponseStateProject)]
enum ResponseState<A: ServiceFactory, M: ServiceFactory> {
CreateMapper(#[pin] M::Future),
MapReady,
@ -263,19 +264,17 @@ where
{
type Output = Result<A::Service, A::InitError>;
#[pin_project::project]
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let mut this = self.as_mut().project();
#[project]
match this.state.as_mut().project() {
ResponseState::CreateMapper(fut) => {
ResponseStateProject::CreateMapper(fut) => {
let mapper = ready!(fut.poll(cx))?;
*this.inner.mapper.borrow_mut() = Some(mapper);
this.state.set(ResponseState::MapReady);
self.poll(cx)
}
ResponseState::MapReady => {
ResponseStateProject::MapReady => {
let mapper = this.inner.mapper.borrow();
ready!(mapper.as_ref().unwrap().poll_ready(cx))?;
let fut = mapper.as_ref().unwrap().call(this.config.take().unwrap());
@ -283,13 +282,13 @@ where
drop(mapper);
self.poll(cx)
}
ResponseState::MapConfig(fut) => {
ResponseStateProject::MapConfig(fut) => {
let config = ready!(fut.poll(cx))?;
let fut = this.inner.a.new_service(config);
this.state.set(ResponseState::CreateService(fut));
self.poll(cx)
}
ResponseState::CreateService(fut) => fut.poll(cx),
ResponseStateProject::CreateService(fut) => fut.poll(cx),
}
}
}

6
ntex-service/src/map_err.rs
View file

@ -71,7 +71,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub struct MapErrFuture<A, F, E>
where
A: Service,
@ -81,6 +81,7 @@ where
#[pin]
fut: A::Future,
}
}
impl<A, F, E> MapErrFuture<A, F, E>
where
@ -168,7 +169,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub struct MapErrServiceFuture<A, F, E>
where
A: ServiceFactory,
@ -178,6 +179,7 @@ where
fut: A::Future,
f: F,
}
}
impl<A, F, E> MapErrServiceFuture<A, F, E>
where

3
ntex-service/src/map_init_err.rs
View file

@ -60,7 +60,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub struct MapInitErrFuture<A, F, E>
where
A: ServiceFactory,
@ -70,6 +70,7 @@ where
#[pin]
fut: A::Future,
}
}
impl<A, F, E> MapInitErrFuture<A, F, E>
where

16
ntex-service/src/then.rs
View file

@ -67,7 +67,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub(crate) struct ThenServiceResponse<A, B>
where
A: Service,
@ -76,8 +76,9 @@ where
#[pin]
state: State<A, B>,
}
}
#[pin_project::pin_project]
#[pin_project::pin_project(project = StateProject)]
enum State<A, B>
where
A: Service,
@ -95,13 +96,11 @@ where
{
type Output = Result<B::Response, B::Error>;
#[pin_project::project]
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let mut this = self.as_mut().project();
#[project]
match this.state.as_mut().project() {
State::A(fut, b) => match fut.poll(cx) {
StateProject::A(fut, b) => match fut.poll(cx) {
Poll::Ready(res) => {
let b = b.take().unwrap();
this.state.set(State::Empty); // drop fut A
@ -111,11 +110,11 @@ where
}
Poll::Pending => Poll::Pending,
},
State::B(fut) => fut.poll(cx).map(|r| {
StateProject::B(fut) => fut.poll(cx).map(|r| {
this.state.set(State::Empty);
r
}),
State::Empty => {
StateProject::Empty => {
panic!("future must not be polled after it returned `Poll::Ready`")
}
}
@ -177,7 +176,7 @@ impl<A, B> Clone for ThenServiceFactory<A, B> {
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub(crate) struct ThenServiceFactoryResponse<A, B>
where
A: ServiceFactory,
@ -195,6 +194,7 @@ where
a: Option<A::Service>,
b: Option<B::Service>,
}
}
impl<A, B> ThenServiceFactoryResponse<A, B>
where

11
ntex-service/src/transform.rs
View file

@ -183,7 +183,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub struct ApplyTransformFuture<T, S>
where
S: ServiceFactory,
@ -193,8 +193,9 @@ where
#[pin]
state: ApplyTransformFutureState<T, S>,
}
}
#[pin_project::pin_project]
#[pin_project::pin_project(project = ApplyTransformFutureStateProject)]
pub enum ApplyTransformFutureState<T, S>
where
S: ServiceFactory,
@ -211,13 +212,11 @@ where
{
type Output = Result<T::Transform, T::InitError>;
#[pin_project::project]
fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
let mut this = self.as_mut().project();
#[project]
match this.state.as_mut().project() {
ApplyTransformFutureState::A(fut) => match fut.poll(cx)? {
ApplyTransformFutureStateProject::A(fut) => match fut.poll(cx)? {
Poll::Ready(srv) => {
let fut = this.store.0.new_transform(srv);
this.state.set(ApplyTransformFutureState::B(fut));
@ -225,7 +224,7 @@ where
}
Poll::Pending => Poll::Pending,
},
ApplyTransformFutureState::B(fut) => fut.poll(cx),
ApplyTransformFutureStateProject::B(fut) => fut.poll(cx),
}
}
}

3
ntex-service/src/transform_err.rs
View file

@ -64,7 +64,7 @@ where
}
}
#[pin_project::pin_project]
pin_project_lite::pin_project! {
pub struct TransformMapInitErrFuture<T, S, F, E>
where
T: Transform<S>,
@ -74,6 +74,7 @@ where
fut: T::Future,
f: F,
}
}
impl<T, S, F, E> Future for TransformMapInitErrFuture<T, S, F, E>
where

1
ntex/src/http/mod.rs
View file

@ -24,6 +24,7 @@ pub mod ws;
pub(crate) use self::message::Message;
pub use self::builder::HttpServiceBuilder;
pub use self::client::Client;
pub use self::config::{DateService, KeepAlive, ServiceConfig};
pub use self::error::ResponseError;
pub use self::header::HeaderMap;