From d7083c15d8dea93f9b95a2736532d6c701cf3f0f Mon Sep 17 00:00:00 2001
From: Nikolay Kim <fafhrd91@gmail.com>
Date: Sat, 18 Dec 2021 20:40:33 +0600
Subject: [PATCH] add ntex-io changes

---
 ntex-io/Cargo.toml   | 8 ++++----
 ntex-rt/Cargo.toml   | 6 +++---
 ntex-tls/Cargo.toml  | 6 +++---
 ntex-util/Cargo.toml | 1 +
 ntex-util/src/lib.rs | 3 +++
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/ntex-io/Cargo.toml b/ntex-io/Cargo.toml
index cf5098b9..39114a7d 100644
--- a/ntex-io/Cargo.toml
+++ b/ntex-io/Cargo.toml
@@ -19,22 +19,22 @@ path = "src/lib.rs"
 default = ["tokio"]
 
 # tokio traits support
-tokio-traits = ["tok-io/net"]
+tokio-traits = ["tok-io/net", "tok-io/rt"]
 
 # tokio runtime support
-tokio = ["tok-io/net"]
+tokio = ["tok-io/net", "tok-io/rt"]
 
 [dependencies]
 bitflags = "1.3"
-fxhash = "0.2.1"
 ntex-codec = "0.6.0"
 ntex-bytes = "0.1.8"
 ntex-util = "0.1.3"
 ntex-service = "0.2.1"
+fxhash = "0.2.1"
 log = "0.4"
 pin-project-lite = "0.2"
 
-tok-io = { version = "1", package = "tokio", default-features = false, features = ["net", "rt"], optional = true }
+tok-io = { version = "1", package = "tokio", default-features = false, optional = true }
 
 [dev-dependencies]
 ntex = "0.5.0-b.0"
diff --git a/ntex-rt/Cargo.toml b/ntex-rt/Cargo.toml
index be46efb0..0c13b321 100644
--- a/ntex-rt/Cargo.toml
+++ b/ntex-rt/Cargo.toml
@@ -22,9 +22,9 @@ default = ["tokio"]
 tokio = ["tok-io", "ntex-io/tokio"]
 
 [dependencies]
-ntex-bytes = "0.1.7"
-ntex-io = "0.1.0"
-ntex-util = "0.1.2"
+ntex-bytes = "0.1.8"
+ntex-io = "0.1.0-b.0"
+ntex-util = "0.1.3"
 async-oneshot = "0.5.0"
 async-channel = "1.6.1"
 log = "0.4"
diff --git a/ntex-tls/Cargo.toml b/ntex-tls/Cargo.toml
index d86d95b3..b14e23bb 100644
--- a/ntex-tls/Cargo.toml
+++ b/ntex-tls/Cargo.toml
@@ -25,9 +25,9 @@ openssl = ["tls_openssl"]
 rustls = ["tls_rust", "webpki-roots"]
 
 [dependencies]
-ntex-bytes = "0.1.7"
-ntex-io = "0.1.0"
-ntex-util = "0.1.2"
+ntex-bytes = "0.1.8"
+ntex-io = "0.1.0-b.0"
+ntex-util = "0.1.3"
 ntex-service = "0.2.1"
 pin-project-lite = "0.2"
 
diff --git a/ntex-util/Cargo.toml b/ntex-util/Cargo.toml
index f301dd7a..a0971a62 100644
--- a/ntex-util/Cargo.toml
+++ b/ntex-util/Cargo.toml
@@ -17,6 +17,7 @@ path = "src/lib.rs"
 
 [dependencies]
 bitflags = "1.2"
+fxhash = "0.2.1"
 log = "0.4"
 slab = "0.4"
 futures-timer = "3.0.2"
diff --git a/ntex-util/src/lib.rs b/ntex-util/src/lib.rs
index 70568dc8..b6bf3898 100644
--- a/ntex-util/src/lib.rs
+++ b/ntex-util/src/lib.rs
@@ -9,6 +9,9 @@ pub mod time;
 pub use futures_core::{ready, Stream};
 pub use futures_sink::Sink;
 
+pub type HashMap<K, V> = std::collections::HashMap<K, V, fxhash::FxBuildHasher>;
+pub type HashSet<V> = std::collections::HashSet<V, fxhash::FxBuildHasher>;
+
 thread_local! {
     #[allow(clippy::type_complexity)]
     static SPAWNER: RefCell<Box<dyn Fn(Pin<Box<dyn Future<Output = ()>>>)>> = RefCell::new(Box::new(|_| {