From a30147120d09b746732fb0e5494eb85c4fd63515 Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sat, 2 Nov 2024 18:12:21 +0500
Subject: [PATCH] Deprecated std::task::ready re-export (#451)

---
 ntex-io/Cargo.toml                | 2 +-
 ntex-io/src/dispatcher.rs         | 5 +++--
 ntex-tokio/src/io.rs              | 4 ++--
 ntex-util/src/lib.rs              | 1 +
 ntex-util/src/services/counter.rs | 6 +-----
 ntex/src/lib.rs                   | 6 +++++-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/ntex-io/Cargo.toml b/ntex-io/Cargo.toml
index aa72bb6a..f9012d53 100644
--- a/ntex-io/Cargo.toml
+++ b/ntex-io/Cargo.toml
@@ -18,7 +18,7 @@ path = "src/lib.rs"
 [dependencies]
 ntex-codec = "0.6"
 ntex-bytes = "0.1"
-ntex-util = "2.3"
+ntex-util = "2.5"
 ntex-service = "3"
 
 bitflags = "2"
diff --git a/ntex-io/src/dispatcher.rs b/ntex-io/src/dispatcher.rs
index faca71eb..4cd49ea3 100644
--- a/ntex-io/src/dispatcher.rs
+++ b/ntex-io/src/dispatcher.rs
@@ -1,10 +1,11 @@
 //! Framed transport dispatcher
 #![allow(clippy::let_underscore_future)]
-use std::{cell::Cell, future::Future, pin::Pin, rc::Rc, task::Context, task::Poll};
+use std::task::{ready, Context, Poll};
+use std::{cell::Cell, future::Future, pin::Pin, rc::Rc};
 
 use ntex_codec::{Decoder, Encoder};
 use ntex_service::{IntoService, Pipeline, PipelineBinding, PipelineCall, Service};
-use ntex_util::{future::Either, ready, spawn, time::Seconds};
+use ntex_util::{future::Either, spawn, time::Seconds};
 
 use crate::{Decoded, DispatchItem, IoBoxed, IoStatusUpdate, RecvError};
 
diff --git a/ntex-tokio/src/io.rs b/ntex-tokio/src/io.rs
index 6c2a1f53..7c25a239 100644
--- a/ntex-tokio/src/io.rs
+++ b/ntex-tokio/src/io.rs
@@ -1,4 +1,4 @@
-use std::task::{Context, Poll};
+use std::task::{ready, Context, Poll};
 use std::{any, cell::RefCell, cmp, future::poll_fn, io, mem, pin::Pin, rc::Rc, rc::Weak};
 
 use ntex_bytes::{Buf, BufMut, BytesVec};
@@ -6,7 +6,7 @@ use ntex_io::{
     types, Filter, Handle, Io, IoBoxed, IoStream, ReadContext, WriteContext,
     WriteContextBuf,
 };
-use ntex_util::{ready, time::Millis};
+use ntex_util::time::Millis;
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 use tokio::net::TcpStream;
 
diff --git a/ntex-util/src/lib.rs b/ntex-util/src/lib.rs
index 4ea95c53..88beb99a 100644
--- a/ntex-util/src/lib.rs
+++ b/ntex-util/src/lib.rs
@@ -2,6 +2,7 @@
 #![deny(rust_2018_idioms, unreachable_pub, missing_debug_implementations)]
 
 #[doc(hidden)]
+#[deprecated]
 pub use std::task::ready;
 
 pub mod channel;
diff --git a/ntex-util/src/services/counter.rs b/ntex-util/src/services/counter.rs
index a8a1e8da..5ceb0c37 100644
--- a/ntex-util/src/services/counter.rs
+++ b/ntex-util/src/services/counter.rs
@@ -102,10 +102,6 @@ impl CounterInner {
 
     fn available(&self, cx: &mut task::Context<'_>) -> bool {
         self.task.register(cx.waker());
-        if self.count.get() < self.capacity {
-            true
-        } else {
-            false
-        }
+        self.count.get() < self.capacity
     }
 }
diff --git a/ntex/src/lib.rs b/ntex/src/lib.rs
index 4e4a7ded..6a6a02cb 100644
--- a/ntex/src/lib.rs
+++ b/ntex/src/lib.rs
@@ -118,5 +118,9 @@ pub mod util {
     pub use ntex_bytes::{
         Buf, BufMut, ByteString, Bytes, BytesMut, BytesVec, Pool, PoolId, PoolRef,
     };
-    pub use ntex_util::{future::*, ready, services::*, HashMap, HashSet};
+    pub use ntex_util::{future::*, services::*, HashMap, HashSet};
+
+    #[doc(hidden)]
+    #[deprecated]
+    pub use std::task::ready;
 }