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

Migrate to ntex-service 1.2 (#209)

Browse source 
* Migrate to ntex-service 1.2
This commit is contained in:
Nikolay Kim 2023-06-15 12:43:26 +06:00
parent e151b1eff1
commit 7960b550c9
84 changed files with 676 additions and 821 deletions
Download patch file Download diff file Expand all files Collapse all files

12
ntex-connect/src/service.rs
View file

@ -3,7 +3,7 @@ use std::{collections::VecDeque, future::Future, io, net::SocketAddr, pin::Pin};
use ntex_bytes::{PoolId, PoolRef};
use ntex_io::{types, Io};
use ntex_service::{Service, ServiceFactory};
use ntex_service::{Ctx, Service, ServiceFactory};
use ntex_util::future::{BoxFuture, Either, Ready};
use crate::{net::tcp_connect_in, Address, Connect, ConnectError, Resolver};
@ -39,7 +39,7 @@ impl<T: Address> Connector<T> {
Connect<T>: From<U>,
{
ConnectServiceResponse {
state: ConnectState::Resolve(self.resolver.call(message.into())),
state: ConnectState::Resolve(Box::pin(self.resolver.lookup(message.into()))),
pool: self.pool,
}
.await
@ -80,13 +80,13 @@ impl<T: Address> Service<Connect<T>> for Connector<T> {
type Future<'f> = ConnectServiceResponse<'f, T>;
#[inline]
fn call(&self, req: Connect<T>) -> Self::Future<'_> {
ConnectServiceResponse::new(self.resolver.call(req))
fn call<'a>(&'a self, req: Connect<T>, _: Ctx<'a, Self>) -> Self::Future<'a> {
ConnectServiceResponse::new(Box::pin(self.resolver.lookup(req)))
}
}
enum ConnectState<'f, T: Address> {
Resolve(<Resolver<T> as Service<Connect<T>>>::Future<'f>),
Resolve(BoxFuture<'f, Result<Connect<T>, ConnectError>>),
Connect(TcpConnectorResponse<T>),
}
@ -97,7 +97,7 @@ pub struct ConnectServiceResponse<'f, T: Address> {
}
impl<'f, T: Address> ConnectServiceResponse<'f, T> {
pub(super) fn new(fut: <Resolver<T> as Service<Connect<T>>>::Future<'f>) -> Self {
pub(super) fn new(fut: BoxFuture<'f, Result<Connect<T>, ConnectError>>) -> Self {
Self {
state: ConnectState::Resolve(fut),
pool: PoolId::P0.pool_ref(),