From c864b10e6293cbbfafafc49d4d270276e51c601f Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Tue, 9 Jan 2024 20:17:07 +0600
Subject: [PATCH] Prepare release

---
 ntex-async-std/Cargo.toml    |  4 ++--
 ntex-connect/Cargo.toml      |  2 +-
 ntex-io/Cargo.toml           |  2 +-
 ntex-rt/Cargo.toml           |  2 +-
 ntex-service/src/and_then.rs |  2 +-
 ntex-service/src/apply.rs    |  4 ++--
 ntex-service/src/boxed.rs    |  4 ----
 ntex-service/src/chain.rs    | 16 ++++++++--------
 ntex-service/src/then.rs     |  5 ++++-
 ntex-tls/Cargo.toml          |  2 +-
 ntex-tokio/Cargo.toml        |  4 ++--
 ntex-util/CHANGES.md         |  4 ++++
 ntex-util/Cargo.toml         |  8 ++++----
 ntex/Cargo.toml              |  2 +-
 14 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/ntex-async-std/Cargo.toml b/ntex-async-std/Cargo.toml
index e2e1dab7..a6224d48 100644
--- a/ntex-async-std/Cargo.toml
+++ b/ntex-async-std/Cargo.toml
@@ -17,8 +17,8 @@ path = "src/lib.rs"
 
 [dependencies]
 ntex-bytes = "0.1.21"
-ntex-io = "1.0.0-b.0"
-ntex-util = "1.0.0-b.0"
+ntex-io = "1.0.0-b.1"
+ntex-util = "1.0.0-b.1"
 log = "0.4"
 pin-project-lite = "0.2"
 async-std = { version = "1", features = ["unstable"] }
diff --git a/ntex-connect/Cargo.toml b/ntex-connect/Cargo.toml
index dd4d4177..944937c4 100644
--- a/ntex-connect/Cargo.toml
+++ b/ntex-connect/Cargo.toml
@@ -34,7 +34,7 @@ glommio = ["ntex-rt/glommio", "ntex-glommio"]
 async-std = ["ntex-rt/async-std", "ntex-async-std"]
 
 [dependencies]
-ntex-service = "2.0.0-b.0"
+ntex-service = "2.0.0"
 ntex-io = "1.0.0-b.1"
 ntex-tls = "1.0.0-b.1"
 ntex-util = "1.0.0-b.1"
diff --git a/ntex-io/Cargo.toml b/ntex-io/Cargo.toml
index 887a8281..abe28fb4 100644
--- a/ntex-io/Cargo.toml
+++ b/ntex-io/Cargo.toml
@@ -19,7 +19,7 @@ path = "src/lib.rs"
 ntex-codec = "0.6.2"
 ntex-bytes = "0.1.21"
 ntex-util = "1.0.0-b.1"
-ntex-service = "2.0.0-b.0"
+ntex-service = "2.0.0"
 
 bitflags = "2.4"
 log = "0.4"
diff --git a/ntex-rt/Cargo.toml b/ntex-rt/Cargo.toml
index 0818a0e9..330dd8f1 100644
--- a/ntex-rt/Cargo.toml
+++ b/ntex-rt/Cargo.toml
@@ -28,7 +28,7 @@ tokio = ["tok-io"]
 async-std = ["async_std/unstable"]
 
 [dependencies]
-async-channel = "2.0"
+async-channel = "2.1"
 futures-core = "0.3"
 log = "0.4"
 oneshot = "0.1"
diff --git a/ntex-service/src/and_then.rs b/ntex-service/src/and_then.rs
index 3ac8d72a..1da0ba58 100644
--- a/ntex-service/src/and_then.rs
+++ b/ntex-service/src/and_then.rs
@@ -165,7 +165,7 @@ mod tests {
     #[ntex::test]
     async fn test_call() {
         let cnt = Rc::new(Cell::new(0));
-        let srv = chain(Srv1(cnt.clone())).and_then(Srv2(cnt)).pipeline();
+        let srv = chain(Srv1(cnt.clone())).and_then(Srv2(cnt)).into_pipeline();
         let res = srv.call("srv1").await;
         assert!(res.is_ok());
         assert_eq!(res.unwrap(), ("srv1", "srv2"));
diff --git a/ntex-service/src/apply.rs b/ntex-service/src/apply.rs
index 8a7ba56f..71733eae 100644
--- a/ntex-service/src/apply.rs
+++ b/ntex-service/src/apply.rs
@@ -235,7 +235,7 @@ mod tests {
             })
             .clone(),
         )
-        .pipeline();
+        .into_pipeline();
 
         assert_eq!(
             lazy(|cx| srv.poll_ready(cx)).await,
@@ -257,7 +257,7 @@ mod tests {
                 Ok((req, ()))
             })
             .clone()
-            .pipeline();
+            .into_pipeline();
 
         assert_eq!(
             lazy(|cx| srv.poll_ready(cx)).await,
diff --git a/ntex-service/src/boxed.rs b/ntex-service/src/boxed.rs
index c74b9bba..a8dbc8f8 100644
--- a/ntex-service/src/boxed.rs
+++ b/ntex-service/src/boxed.rs
@@ -3,9 +3,7 @@ use std::{fmt, future::Future, pin::Pin, task::Context, task::Poll};
 use crate::ctx::{ServiceCtx, WaitersRef};
 
 pub type BoxFuture<'a, I, E> = Pin<Box<dyn Future<Output = Result<I, E>> + 'a>>;
-
 pub struct BoxService<Req, Res, Err>(Box<dyn ServiceObj<Req, Response = Res, Error = Err>>);
-
 pub struct BoxServiceFactory<Cfg, Req, Res, Err, InitErr>(
     Box<dyn ServiceFactoryObj<Req, Cfg, Response = Res, Error = Err, InitError = InitErr>>,
 );
@@ -70,12 +68,10 @@ where
     type Response = S::Response;
     type Error = S::Error;
 
-    #[inline]
     fn poll_ready(&self, cx: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
         crate::Service::poll_ready(self, cx)
     }
 
-    #[inline]
     fn poll_shutdown(&self, cx: &mut Context<'_>) -> Poll<()> {
         crate::Service::poll_shutdown(self, cx)
     }
diff --git a/ntex-service/src/chain.rs b/ntex-service/src/chain.rs
index 7f278a87..7d6a0d48 100644
--- a/ntex-service/src/chain.rs
+++ b/ntex-service/src/chain.rs
@@ -11,7 +11,7 @@ use crate::middleware::{ApplyMiddleware, Middleware};
 use crate::then::{Then, ThenFactory};
 use crate::{IntoService, IntoServiceFactory, Pipeline, Service, ServiceFactory};
 
-/// Constructs new pipeline with one service in pipeline chain.
+/// Constructs new chain with one service.
 pub fn chain<Svc, Req, F>(service: F) -> ServiceChain<Svc, Req>
 where
     Svc: Service<Req>,
@@ -23,7 +23,7 @@ where
     }
 }
 
-/// Constructs new pipeline factory with one service factory.
+/// Constructs new chain factory with one service factory.
 pub fn chain_factory<T, R, C, F>(factory: F) -> ServiceChainFactory<T, R, C>
 where
     T: ServiceFactory<R, C>,
@@ -35,7 +35,7 @@ where
     }
 }
 
-/// Pipeline builder - pipeline allows to compose multiple service into one service.
+/// Chain builder - chain allows to compose multiple service into one service.
 pub struct ServiceChain<Svc, Req> {
     service: Svc,
     _t: PhantomData<Req>,
@@ -139,7 +139,7 @@ impl<Svc: Service<Req>, Req> ServiceChain<Svc, Req> {
     }
 
     /// Create service pipeline
-    pub fn pipeline(self) -> Pipeline<Svc> {
+    pub fn into_pipeline(self) -> Pipeline<Svc> {
         Pipeline::new(self.service)
     }
 }
@@ -239,11 +239,11 @@ impl<T: ServiceFactory<Req, C>, Req, C> ServiceChainFactory<T, Req, C> {
         }
     }
 
-    /// Create `NewService` to chain on a computation for when a call to the
+    /// Create chain factory to chain on a computation for when a call to the
     /// service finished, passing the result of the call to the next
     /// service `U`.
     ///
-    /// Note that this function consumes the receiving pipeline and returns a
+    /// Note that this function consumes the receiving factory and returns a
     /// wrapped version of it.
     pub fn then<F, U>(self, factory: F) -> ServiceChainFactory<ThenFactory<T, U>, Req, C>
     where
@@ -279,7 +279,7 @@ impl<T: ServiceFactory<Req, C>, Req, C> ServiceChainFactory<T, Req, C> {
         }
     }
 
-    /// Map this service's error to a different error, returning a new service.
+    /// Map this service's error to a different error.
     pub fn map_err<F, E>(
         self,
         f: F,
@@ -294,7 +294,7 @@ impl<T: ServiceFactory<Req, C>, Req, C> ServiceChainFactory<T, Req, C> {
         }
     }
 
-    /// Map this factory's init error to a different error, returning a new service.
+    /// Map this factory's init error to a different error, returning a new factory.
     pub fn map_init_err<F, E>(
         self,
         f: F,
diff --git a/ntex-service/src/then.rs b/ntex-service/src/then.rs
index f39a8889..6b01951a 100644
--- a/ntex-service/src/then.rs
+++ b/ntex-service/src/then.rs
@@ -164,7 +164,10 @@ mod tests {
     #[ntex::test]
     async fn test_call() {
         let cnt = Rc::new(Cell::new(0));
-        let srv = chain(Srv1(cnt.clone())).then(Srv2(cnt)).clone().pipeline();
+        let srv = chain(Srv1(cnt.clone()))
+            .then(Srv2(cnt))
+            .clone()
+            .into_pipeline();
 
         let res = srv.call(Ok("srv1")).await;
         assert!(res.is_ok());
diff --git a/ntex-tls/Cargo.toml b/ntex-tls/Cargo.toml
index 74f8cac2..d8664855 100644
--- a/ntex-tls/Cargo.toml
+++ b/ntex-tls/Cargo.toml
@@ -28,7 +28,7 @@ rustls = ["tls_rust"]
 ntex-bytes = "0.1.21"
 ntex-io = "1.0.0-b.1"
 ntex-util = "1.0.0-b.1"
-ntex-service = "2.0.0-b.0"
+ntex-service = "2.0.0"
 log = "0.4"
 pin-project-lite = "0.2"
 
diff --git a/ntex-tokio/Cargo.toml b/ntex-tokio/Cargo.toml
index 62508a0f..f0b51f48 100644
--- a/ntex-tokio/Cargo.toml
+++ b/ntex-tokio/Cargo.toml
@@ -17,8 +17,8 @@ path = "src/lib.rs"
 
 [dependencies]
 ntex-bytes = "0.1.21"
-ntex-io = "1.0.0-b.0"
-ntex-util = "1.0.0-b.0"
+ntex-io = "1.0.0-b.1"
+ntex-util = "1.0.0-b.1"
 log = "0.4"
 pin-project-lite = "0.2"
 tokio = { version = "1", default-features = false, features = ["rt", "net", "sync", "signal"] }
diff --git a/ntex-util/CHANGES.md b/ntex-util/CHANGES.md
index 6aabb910..f4e3b158 100644
--- a/ntex-util/CHANGES.md
+++ b/ntex-util/CHANGES.md
@@ -1,5 +1,9 @@
 # Changes
 
+## [1.0.0] - 2024-01-09
+
+* Release
+
 ## [1.0.0-b.1] - 2024-01-xx
 
 * Remove unnecessary 'static
diff --git a/ntex-util/Cargo.toml b/ntex-util/Cargo.toml
index 473b4a2d..d9bb70ca 100644
--- a/ntex-util/Cargo.toml
+++ b/ntex-util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ntex-util"
-version = "1.0.0-b.1"
+version = "1.0.0"
 authors = ["ntex contributors <team@ntex.rs>"]
 description = "Utilities for ntex framework"
 keywords = ["network", "framework", "async", "futures"]
@@ -16,8 +16,8 @@ name = "ntex_util"
 path = "src/lib.rs"
 
 [dependencies]
-ntex-rt = "0.4.7"
-ntex-service = "2.0.0-b.0"
+ntex-rt = "0.4.11"
+ntex-service = "2.0.0"
 bitflags = "2.4"
 fxhash = "0.2.1"
 log = "0.4"
@@ -28,7 +28,7 @@ futures-sink = { version = "0.3", default-features = false, features = ["alloc"]
 pin-project-lite = "0.2.9"
 
 [dev-dependencies]
-ntex = { version = "1.0.0-b.0", features = ["tokio"] }
+ntex = { version = "1.0.0-b.1", features = ["tokio"] }
 ntex-bytes = "0.1.21"
 ntex-macros = "0.1.3"
 futures-util = { version = "0.3", default-features = false, features = ["alloc"] }
diff --git a/ntex/Cargo.toml b/ntex/Cargo.toml
index f4bd219b..366a3efb 100644
--- a/ntex/Cargo.toml
+++ b/ntex/Cargo.toml
@@ -52,7 +52,7 @@ ntex-codec = "0.6.2"
 ntex-connect = "1.0.0-b.1"
 ntex-http = "0.1.11"
 ntex-router = "0.5.2"
-ntex-service = "2.0.0-b.0"
+ntex-service = "2.0.0"
 ntex-macros = "0.1.3"
 ntex-util = "1.0.0-b.0"
 ntex-bytes = "0.1.21"