Update ntex deps

CHANGES.md

@@ -1,5 +1,9 @@
 # Changes
 
+## [0.11.4] - 2023-08-10
+
+* Update ntex deps
+
 ## [0.11.3] - 2023-06-26
 
 * Update BufferService usage

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex-mqtt"
-version = "0.11.3"
+version = "0.11.4"
 authors = ["ntex contributors <[email protected]>"]
 description = "Client and Server framework for MQTT v5 and v3.1.1 protocols"
 documentation = "https://docs.rs/ntex-mqtt"
@@ -12,7 +12,7 @@ exclude = [".gitignore", ".travis.yml", ".cargo/config"]
 edition = "2018"
 
 [dependencies]
-ntex = "0.7.2"
+ntex = "0.7.3"
 ntex-util = "0.3.1"
 bitflags = "1.3"
 log = "0.4"
@@ -27,7 +27,7 @@ ntex-tls = "0.3.0"
 rustls = "0.21"
 rustls-pemfile = "1.0"
 openssl = "0.10"
-ntex = { version = "0.7.2", features = ["tokio", "rustls", "openssl"] }
+ntex = { version = "0.7.3", features = ["tokio", "rustls", "openssl"] }
 test-case = "3"
 
 [profile.dev]

src/io.rs

@@ -321,7 +321,7 @@ where
                     if let Some(item) = item {
                         // optimize first call
                         if this.response.is_none() {
-                            this.response.set(Some(this.service.call(item)));
+                            this.response.set(Some(this.service.call_static(item)));
                             let res = this.response.as_mut().as_pin_mut().unwrap().poll(cx);
 
                             let mut state = inner.state.borrow_mut();
@@ -360,7 +360,7 @@ where
                             let st = inner.io.get_ref();
                             let codec = this.codec.clone();
                             let state = inner.state.clone();
-                            let fut = this.service.call(item);
+                            let fut = this.service.call_static(item);
                             ntex::rt::spawn(async move {
                                 let item = fut.await;
                                 state.borrow_mut().handle_result(

src/v3/client/connection.rs

@@ -252,7 +252,7 @@ where
     S: Service<Publish, Response = (), Error = PErr>,
     Err: From<PErr>,
 {
-    match srv.service_call(req).await {
+    match srv.call(req).await {
         Ok(_) => Ok(Either::Left(())),
         Err(err) => Err(err.into()),
     }

src/v3/client/connector.rs

@@ -207,8 +207,7 @@ where
     async fn _connect(&self) -> Result<Client, ClientError<codec::ConnectAck>> {
         let io: IoBoxed = self
             .connector
-            .clone()
-            .service_call(Connect::new(self.address.clone()))
+            .call(Connect::new(self.address.clone()))
             .await?
             .into();
         let pkt = self.pkt.clone();

src/v3/client/dispatcher.rs

@@ -91,7 +91,7 @@ where
             let inner = self.inner.clone();
             *shutdown = Some(Box::pin(async move {
                 let _ =
-                    Pipeline::new(&inner.control).service_call(ControlMessage::closed()).await;
+                    Pipeline::new(&inner.control).call(ControlMessage::closed()).await;
             }));
         }
 

src/v3/dispatcher.rs

@@ -146,7 +146,7 @@ where
             let inner = self.inner.clone();
             *shutdown = Some(Box::pin(async move {
                 let _ =
-                    Pipeline::new(&inner.control).service_call(ControlMessage::closed()).await;
+                    Pipeline::new(&inner.control).call(ControlMessage::closed()).await;
             }));
         }
 

src/v5/client/connection.rs

@@ -308,7 +308,7 @@ where
     S: Service<Publish, Response = PublishAck>,
     PublishAck: TryFrom<S::Error, Error = Err>,
 {
-    match srv.service_call(req).await {
+    match srv.call(req).await {
         Ok(ack) => Ok(Either::Right(ack)),
         Err(err) => match PublishAck::try_from(err) {
             Ok(ack) => Ok(Either::Right(ack)),

src/v5/client/connector.rs

@@ -211,8 +211,7 @@ where
     async fn _connect(&self) -> Result<Client, ClientError<Box<codec::ConnectAck>>> {
         let io: IoBoxed = self
             .connector
-            .clone()
-            .service_call(Connect::new(self.address.clone()))
+            .call(Connect::new(self.address.clone()))
             .await?
             .into();
         let pkt = self.pkt.clone();

src/v5/client/dispatcher.rs

@@ -117,7 +117,7 @@ where
             let inner = self.inner.clone();
             *shutdown = Some(Box::pin(async move {
                 let _ =
-                    Pipeline::new(&inner.control).service_call(ControlMessage::closed()).await;
+                    Pipeline::new(&inner.control).call(ControlMessage::closed()).await;
             }));
         }
 

src/v5/dispatcher.rs

@@ -153,7 +153,7 @@ where
             let inner = self.inner.clone();
             *shutdown = Some(Box::pin(async move {
                 let _ =
-                    Pipeline::new(&inner.control).service_call(ControlMessage::closed()).await;
+                    Pipeline::new(&inner.control).call(ControlMessage::closed()).await;
             }));
         }