Use GAT (#153)

* Rename Transform to Middleware

* Drop FnService's shutdown helper

* refactor Service trait to use GAT

* Migrate ntex to new service

* move Stack to service

* use BoxFuture

* simplify poll_shitdown method

ntex-tls/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-tls"
-version = "0.1.7"
+version = "0.2.0-alpha.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "An implementation of SSL streams for ntex backed by OpenSSL"
 keywords = ["network", "framework", "async", "futures"]
@@ -26,9 +26,9 @@ rustls = ["tls_rust"]
 
 [dependencies]
 ntex-bytes = "0.1.14"
-ntex-io = "0.1.8"
-ntex-util = "0.1.15"
-ntex-service = "0.3.1"
+ntex-io = "0.2.0-alpha.0"
+ntex-util = "0.2.0-alpha.0"
+ntex-service = "0.4.0-alpha.0"
 log = "0.4"
 pin-project-lite = "0.2"
 
@@ -39,7 +39,7 @@ tls_openssl = { version="0.10.42", package = "openssl", optional = true }
 tls_rust = { version = "0.20", package = "rustls", optional = true }
 
 [dev-dependencies]
-ntex = { version = "0.5", features = ["openssl", "rustls", "tokio"] }
+ntex = { version = "0.6.0-alpha.0", features = ["openssl", "rustls", "tokio"] }
 env_logger = "0.10"
 rustls-pemfile = { version = "0.2" }
 webpki-roots = { version = "0.22" }

ntex-tls/src/openssl/accept.rs

@@ -52,15 +52,15 @@ impl<F> Clone for Acceptor<F> {
     }
 }
 
-impl<F: Filter, C> ServiceFactory<Io<F>, C> for Acceptor<F> {
+impl<F: Filter, C: 'static> ServiceFactory<Io<F>, C> for Acceptor<F> {
     type Response = Io<SslFilter<F>>;
     type Error = Box<dyn Error>;
     type Service = AcceptorService<F>;
     type InitError = ();
-    type Future = Ready<Self::Service, Self::InitError>;
+    type Future<'f> = Ready<Self::Service, Self::InitError>;
 
     #[inline]
-    fn new_service(&self, _: C) -> Self::Future {
+    fn create(&self, _: C) -> Self::Future<'_> {
         MAX_SSL_ACCEPT_COUNTER.with(|conns| {
             Ready::Ok(AcceptorService {
                 acceptor: self.acceptor.clone(),
@@ -83,7 +83,7 @@ pub struct AcceptorService<F> {
 impl<F: Filter> Service<Io<F>> for AcceptorService<F> {
     type Response = Io<SslFilter<F>>;
     type Error = Box<dyn Error>;
-    type Future = AcceptorServiceResponse<F>;
+    type Future<'f> = AcceptorServiceResponse<F>;
 
     #[inline]
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
@@ -95,7 +95,7 @@ impl<F: Filter> Service<Io<F>> for AcceptorService<F> {
     }
 
     #[inline]
-    fn call(&self, req: Io<F>) -> Self::Future {
+    fn call(&self, req: Io<F>) -> Self::Future<'_> {
         AcceptorServiceResponse {
             _guard: self.conns.get(),
             fut: self.acceptor.clone().create(req),

ntex-tls/src/openssl/mod.rs

@@ -1,13 +1,11 @@
 #![allow(clippy::type_complexity)]
 //! An implementation of SSL streams for ntex backed by OpenSSL
 use std::cell::{Cell, RefCell};
-use std::{
-    any, cmp, error::Error, future::Future, io, pin::Pin, task::Context, task::Poll,
-};
+use std::{any, cmp, error::Error, io, task::Context, task::Poll};
 
 use ntex_bytes::{BufMut, BytesVec, PoolRef};
 use ntex_io::{types, Base, Filter, FilterFactory, Io, IoRef, ReadStatus, WriteStatus};
-use ntex_util::{future::poll_fn, ready, time, time::Millis};
+use ntex_util::{future::poll_fn, future::BoxFuture, ready, time, time::Millis};
 use tls_openssl::ssl::{self, NameType, SslStream};
 use tls_openssl::x509::X509;
 
@@ -288,7 +286,7 @@ impl<F: Filter> FilterFactory<F> for SslAcceptor {
     type Filter = SslFilter<F>;
 
     type Error = Box<dyn Error>;
-    type Future = Pin<Box<dyn Future<Output = Result<Io<Self::Filter>, Self::Error>>>>;
+    type Future = BoxFuture<'static, Result<Io<Self::Filter>, Self::Error>>;
 
     fn create(self, st: Io<F>) -> Self::Future {
         let timeout = self.timeout;
@@ -346,7 +344,7 @@ impl<F: Filter> FilterFactory<F> for SslConnector {
     type Filter = SslFilter<F>;
 
     type Error = Box<dyn Error>;
-    type Future = Pin<Box<dyn Future<Output = Result<Io<Self::Filter>, Self::Error>>>>;
+    type Future = BoxFuture<'static, Result<Io<Self::Filter>, Self::Error>>;
 
     fn create(self, st: Io<F>) -> Self::Future {
         Box::pin(async move {

ntex-tls/src/rustls/accept.rs

@@ -51,15 +51,16 @@ impl<F> Clone for Acceptor<F> {
     }
 }
 
-impl<F: Filter, C> ServiceFactory<Io<F>, C> for Acceptor<F> {
+impl<F: Filter, C: 'static> ServiceFactory<Io<F>, C> for Acceptor<F> {
     type Response = Io<TlsFilter<F>>;
     type Error = io::Error;
     type Service = AcceptorService<F>;
 
     type InitError = ();
-    type Future = Ready<Self::Service, Self::InitError>;
+    type Future<'f> = Ready<Self::Service, Self::InitError> where Self: 'f, C: 'f;
 
-    fn new_service(&self, _: C) -> Self::Future {
+    #[inline]
+    fn create(&self, _: C) -> Self::Future<'_> {
         MAX_SSL_ACCEPT_COUNTER.with(|conns| {
             Ready::Ok(AcceptorService {
                 acceptor: self.inner.clone(),
@@ -80,7 +81,7 @@ pub struct AcceptorService<F> {
 impl<F: Filter> Service<Io<F>> for AcceptorService<F> {
     type Response = Io<TlsFilter<F>>;
     type Error = io::Error;
-    type Future = AcceptorServiceFut<F>;
+    type Future<'f> = AcceptorServiceFut<F>;
 
     #[inline]
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
@@ -92,7 +93,7 @@ impl<F: Filter> Service<Io<F>> for AcceptorService<F> {
     }
 
     #[inline]
-    fn call(&self, req: Io<F>) -> Self::Future {
+    fn call(&self, req: Io<F>) -> Self::Future<'_> {
         AcceptorServiceFut {
             _guard: self.conns.get(),
             fut: self.acceptor.clone().create(req),