Migrate ntex to async fn in trait

ntex-service/Cargo.toml

@@ -20,5 +20,5 @@ pin-project-lite = "0.2.6"
 slab = "0.4"
 
 [dev-dependencies]
-ntex = { version = "0.7.0", features = ["tokio"] }
-ntex-util = "0.3.0"
+ntex = { version = "1.0", features = ["tokio"] }
+ntex-util = "1.0.0"

ntex-service/src/and_then.rs

@@ -110,10 +110,10 @@ mod tests {
             Poll::Ready(Ok(()))
         }
 
-        async fn call<'a>(
-            &'a self,
+        async fn call(
+            &self,
             req: &'static str,
-            _: ServiceCtx<'a, Self>,
+            _: ServiceCtx<'_, Self>,
         ) -> Result<Self::Response, ()> {
             Ok(req)
         }
@@ -131,10 +131,10 @@ mod tests {
             Poll::Ready(Ok(()))
         }
 
-        async fn call<'a>(
-            &'a self,
+        async fn call(
+            &self,
             req: &'static str,
-            _: ServiceCtx<'a, Self>,
+            _: ServiceCtx<'_, Self>,
         ) -> Result<Self::Response, ()> {
             Ok((req, "srv2"))
         }

ntex-service/src/apply.rs

@@ -212,7 +212,7 @@ mod tests {
         type Response = ();
         type Error = ();
 
-        async fn call<'a>(&'a self, _: (), _: ServiceCtx<'a, Self>) -> Result<(), ()> {
+        async fn call(&self, _: (), _: ServiceCtx<'_, Self>) -> Result<(), ()> {
             Ok(())
         }
     }

ntex-service/src/ctx.rs

@@ -212,10 +212,10 @@ mod tests {
             self.1.poll_ready(cx).map(|_| Ok(()))
         }
 
-        async fn call<'a>(
-            &'a self,
+        async fn call(
+            &self,
             req: &'static str,
-            ctx: ServiceCtx<'a, Self>,
+            ctx: ServiceCtx<'_, Self>,
         ) -> Result<Self::Response, Self::Error> {
             let _ = ctx.clone();
             Ok(req)

ntex-service/src/lib.rs

@@ -69,7 +69,7 @@ pub use self::pipeline::{Pipeline, PipelineCall};
 ///     type Response = u64;
 ///     type Error = Infallible;
 ///
-///     async fn call<'a>(&'a self, req: u8, _: ServiceCtx<'a, Self>) -> Result<Self::Response, Self::Error> {
+///     async fn call(&self, req: u8, _: ServiceCtx<'_, Self>) -> Result<Self::Response, Self::Error> {
 ///         Ok(req as u64)
 ///     }
 /// }

ntex-service/src/map.rs

@@ -162,7 +162,7 @@ mod tests {
             Poll::Ready(Ok(()))
         }
 
-        async fn call<'a>(&'a self, _: (), _: ServiceCtx<'a, Self>) -> Result<(), ()> {
+        async fn call(&self, _: (), _: ServiceCtx<'_, Self>) -> Result<(), ()> {
             Ok(())
         }
     }

ntex-service/src/map_err.rs

@@ -178,7 +178,7 @@ mod tests {
             }
         }
 
-        async fn call<'a>(&'a self, _: (), _: ServiceCtx<'a, Self>) -> Result<(), ()> {
+        async fn call(&self, _: (), _: ServiceCtx<'_, Self>) -> Result<(), ()> {
             Err(())
         }
     }

ntex-service/src/middleware.rs

@@ -215,10 +215,10 @@ mod tests {
             self.0.poll_ready(cx)
         }
 
-        async fn call<'a>(
-            &'a self,
+        async fn call(
+            &self,
             req: R,
-            ctx: ServiceCtx<'a, Self>,
+            ctx: ServiceCtx<'_, Self>,
         ) -> Result<S::Response, S::Error> {
             ctx.call(&self.0, req).await
         }

ntex-service/src/then.rs

@@ -114,10 +114,10 @@ mod tests {
             Poll::Ready(Ok(()))
         }
 
-        async fn call<'a>(
-            &'a self,
+        async fn call(
+            &self,
             req: Result<&'static str, &'static str>,
-            _: ServiceCtx<'a, Self>,
+            _: ServiceCtx<'_, Self>,
         ) -> Result<&'static str, ()> {
             match req {
                 Ok(msg) => Ok(msg),
@@ -138,10 +138,10 @@ mod tests {
             Poll::Ready(Ok(()))
         }
 
-        async fn call<'a>(
-            &'a self,
+        async fn call(
+            &self,
             req: Result<&'static str, ()>,
-            _: ServiceCtx<'a, Self>,
+            _: ServiceCtx<'_, Self>,
         ) -> Result<Self::Response, ()> {
             match req {
                 Ok(msg) => Ok((msg, "ok")),