From fdfb3d45dbf85e7b4ecd1b2dacfec11bf584a7dd Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 26 Feb 2023 03:50:36 +0000
Subject: [PATCH] remove direct dep on ahash for client pool

---
 actix-http/Cargo.toml  | 2 +-
 actix-web/Cargo.toml   | 2 +-
 awc/Cargo.toml         | 1 -
 awc/src/client/pool.rs | 7 +++----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml
index 71b5a600b..108b2314a 100644
--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -61,7 +61,7 @@ actix-codec = "0.5"
 actix-utils = "3"
 actix-rt = { version = "2.2", default-features = false }
 
-ahash = "0.7"
+ahash = "0.8"
 bitflags = "1.2"
 bytes = "1"
 bytestring = "1"
diff --git a/actix-web/Cargo.toml b/actix-web/Cargo.toml
index afc7feab1..6eb1f862b 100644
--- a/actix-web/Cargo.toml
+++ b/actix-web/Cargo.toml
@@ -72,7 +72,7 @@ actix-http = { version = "3.3", features = ["http2", "ws"] }
 actix-router = "0.5"
 actix-web-codegen = { version = "4.2", optional = true }
 
-ahash = "0.7"
+ahash = "0.8"
 bytes = "1"
 bytestring = "1"
 cfg-if = "1"
diff --git a/awc/Cargo.toml b/awc/Cargo.toml
index 0c3027c99..8a75e28f7 100644
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -62,7 +62,6 @@ actix-rt = { version = "2.1", default-features = false }
 actix-tls = { version = "3", features = ["connect", "uri"] }
 actix-utils = "3"
 
-ahash = "0.7"
 base64 = "0.21"
 bytes = "1"
 cfg-if = "1"
diff --git a/awc/src/client/pool.rs b/awc/src/client/pool.rs
index 47c1fdd67..632608c45 100644
--- a/awc/src/client/pool.rs
+++ b/awc/src/client/pool.rs
@@ -2,7 +2,7 @@
 
 use std::{
     cell::RefCell,
-    collections::VecDeque,
+    collections::{HashMap, VecDeque},
     future::Future,
     io,
     ops::Deref,
@@ -17,7 +17,6 @@ use actix_codec::{AsyncRead, AsyncWrite, ReadBuf};
 use actix_http::Protocol;
 use actix_rt::time::{sleep, Sleep};
 use actix_service::Service;
-use ahash::AHashMap;
 use futures_core::future::LocalBoxFuture;
 use futures_util::FutureExt as _;
 use http::uri::Authority;
@@ -62,7 +61,7 @@ where
 {
     fn new(config: ConnectorConfig) -> Self {
         let permits = Arc::new(Semaphore::new(config.limit));
-        let available = RefCell::new(AHashMap::default());
+        let available = RefCell::new(HashMap::default());
 
         Self(Rc::new(ConnectionPoolInnerPriv {
             config,
@@ -124,7 +123,7 @@ where
     Io: AsyncWrite + Unpin + 'static,
 {
     config: ConnectorConfig,
-    available: RefCell<AHashMap<Key, VecDeque<PooledConnection<Io>>>>,
+    available: RefCell<HashMap<Key, VecDeque<PooledConnection<Io>>>>,
     permits: Arc<Semaphore>,
 }