use new service trait

Author: fafhrd91

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.3.0-b.2] - 2021-12-xx
+
+* Update service trait
+
 ## [0.3.0-b.1] - 2021-12-22
 
 * Upgrade to ntex 0.5.0 b.2

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-redis"
-version = "0.3.0-b.1"
+version = "0.3.0-b.2"
 authors = ["ntex contributors <[email protected]>"]
 description = "Redis client"
 documentation = "https://docs.rs/ntex-redis"
@@ -21,7 +21,7 @@ openssl = ["ntex/openssl"]
 rustls = ["ntex/rustls"]
 
 [dependencies]
-ntex = "0.5.0-b.2"
+ntex = "0.5.0-b.3"
 itoa = "0.4.5"
 btoi = "0.4.2"
 log = "0.4"
@@ -30,3 +30,10 @@ derive_more = "0.99"
 [dev-dependencies]
 rand = "0.8"
 env_logger = "0.9"
+
+[patch.crates-io]
+ntex = { git = "https://github.com/ntex-rs/ntex.git" }
+ntex-io = { git = "https://github.com/ntex-rs/ntex.git" }
+ntex-rt = { git = "https://github.com/ntex-rs/ntex.git" }
+ntex-service = { git = "https://github.com/ntex-rs/ntex.git" }
+ntex-tls = { git = "https://github.com/ntex-rs/ntex.git" }

src/client.rs

@@ -101,8 +101,7 @@ impl Client {
     }
 }
 
-impl Service for Client {
-    type Request = Request;
+impl Service<Request> for Client {
     type Response = Response;
     type Error = Error;
     type Future = Either<CommandResult, Ready<Response, Error>>;

src/connector.rs

@@ -31,12 +31,12 @@ where
         address: A,
     ) -> RedisConnector<
         A,
-        impl Service<Request = Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
+        impl Service<Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
     > {
         RedisConnector {
             address,
             passwords: Vec::new(),
-            connector: Connector::default().map(|io| io.into_boxed()),
+            connector: Connector::default().map(|io| io.seal()),
             pool: PoolId::P7.pool_ref(),
         }
     }
@@ -45,7 +45,7 @@ where
 impl<A, T> RedisConnector<A, T>
 where
     A: Address + Clone,
-    T: Service<Request = Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
+    T: Service<Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
 {
     /// Add redis auth password
     pub fn password<U>(mut self, password: U) -> Self
@@ -72,14 +72,14 @@ where
         connector: U,
     ) -> RedisConnector<
         A,
-        impl Service<Request = Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
+        impl Service<Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
     >
     where
         F: Filter,
-        U: Service<Request = Connect<A>, Response = Io<F>, Error = connect::ConnectError>,
+        U: Service<Connect<A>, Response = Io<F>, Error = connect::ConnectError>,
     {
         RedisConnector {
-            connector: connector.map(|io| io.into_boxed()),
+            connector: connector.map(|io| io.seal()),
             address: self.address,
             passwords: self.passwords,
             pool: self.pool,
@@ -89,7 +89,7 @@ where
     /// Use custom boxed connector
     pub fn boxed_connector<U>(self, connector: U) -> RedisConnector<A, U>
     where
-        U: Service<Request = Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
+        U: Service<Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
     {
         RedisConnector {
             connector,
@@ -106,7 +106,7 @@ where
         connector: SslConnector,
     ) -> RedisConnector<
         A,
-        impl Service<Request = Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
+        impl Service<Connect<A>, Response = IoBoxed, Error = connect::ConnectError>,
     > {
         RedisConnector {
             address: self.address,