From fcba74f92952c93f33cd4f78622639681b6dd2fe Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Sun, 21 Nov 2021 11:56:18 -0800
Subject: [PATCH] Replace fxhash with rustc_hash, its successor

---
 quinn-proto/Cargo.toml                      | 2 +-
 quinn-proto/src/connection/cid_state.rs     | 2 +-
 quinn-proto/src/connection/spaces.rs        | 2 +-
 quinn-proto/src/connection/streams/state.rs | 2 +-
 quinn-proto/src/endpoint.rs                 | 2 +-
 quinn/Cargo.toml                            | 2 +-
 quinn/src/connection.rs                     | 2 +-
 quinn/src/endpoint.rs                       | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/quinn-proto/Cargo.toml b/quinn-proto/Cargo.toml
index 2164f877f..e6ff4590a 100644
--- a/quinn-proto/Cargo.toml
+++ b/quinn-proto/Cargo.toml
@@ -24,7 +24,7 @@ native-certs = ["rustls-native-certs"]
 [dependencies]
 arbitrary = { version = "1.0.1", features = ["derive"], optional = true }
 bytes = "1"
-fxhash = "0.2.1"
+rustc-hash = "1.1"
 rand = "0.8"
 ring = { version = "0.16.7", optional = true }
 # If rustls gets updated to a new version which contains
diff --git a/quinn-proto/src/connection/cid_state.rs b/quinn-proto/src/connection/cid_state.rs
index 5184eaf9c..873c9cbb5 100644
--- a/quinn-proto/src/connection/cid_state.rs
+++ b/quinn-proto/src/connection/cid_state.rs
@@ -4,7 +4,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use fxhash::FxHashSet;
+use rustc_hash::FxHashSet;
 use tracing::{debug, trace};
 
 use crate::{shared::IssuedCid, TransportError};
diff --git a/quinn-proto/src/connection/spaces.rs b/quinn-proto/src/connection/spaces.rs
index 7f0e9d05d..e4b0bb982 100644
--- a/quinn-proto/src/connection/spaces.rs
+++ b/quinn-proto/src/connection/spaces.rs
@@ -6,7 +6,7 @@ use std::{
     time::{Duration, Instant},
 };
 
-use fxhash::FxHashSet;
+use rustc_hash::FxHashSet;
 
 use super::assembler::Assembler;
 use crate::{
diff --git a/quinn-proto/src/connection/streams/state.rs b/quinn-proto/src/connection/streams/state.rs
index f1ddc51e0..2bab10862 100644
--- a/quinn-proto/src/connection/streams/state.rs
+++ b/quinn-proto/src/connection/streams/state.rs
@@ -5,7 +5,7 @@ use std::{
 };
 
 use bytes::BufMut;
-use fxhash::FxHashMap;
+use rustc_hash::FxHashMap;
 use tracing::{debug, trace};
 
 use super::{
diff --git a/quinn-proto/src/endpoint.rs b/quinn-proto/src/endpoint.rs
index ae8b1f810..f8e609b08 100644
--- a/quinn-proto/src/endpoint.rs
+++ b/quinn-proto/src/endpoint.rs
@@ -9,8 +9,8 @@ use std::{
 };
 
 use bytes::{BufMut, Bytes, BytesMut};
-use fxhash::FxHashMap;
 use rand::{rngs::StdRng, Rng, RngCore, SeedableRng};
+use rustc_hash::FxHashMap;
 use slab::Slab;
 use thiserror::Error;
 use tracing::{debug, trace, warn};
diff --git a/quinn/Cargo.toml b/quinn/Cargo.toml
index 6fe05a57d..218386d9c 100644
--- a/quinn/Cargo.toml
+++ b/quinn/Cargo.toml
@@ -29,7 +29,7 @@ maintenance = { status = "experimental" }
 bytes = "1"
 futures-util = { version = "0.3.11", default-features = false, features = ["io"] }
 futures-channel = "0.3.11"
-fxhash = "0.2.1"
+rustc-hash = "1.1"
 proto = { package = "quinn-proto", path = "../quinn-proto", version = "0.8", default-features = false }
 rustls = { version = "0.20", default-features = false, features = ["quic"], optional = true }
 thiserror = "1.0.21"
diff --git a/quinn/src/connection.rs b/quinn/src/connection.rs
index dbd5c51ed..af91ea3f6 100644
--- a/quinn/src/connection.rs
+++ b/quinn/src/connection.rs
@@ -13,8 +13,8 @@ use std::{
 use bytes::Bytes;
 use futures_channel::{mpsc, oneshot};
 use futures_util::{FutureExt, StreamExt};
-use fxhash::FxHashMap;
 use proto::{ConnectionError, ConnectionHandle, ConnectionStats, Dir, StreamEvent, StreamId};
+use rustc_hash::FxHashMap;
 use thiserror::Error;
 use tokio::time::{sleep_until, Instant as TokioInstant, Sleep};
 use tracing::info_span;
diff --git a/quinn/src/endpoint.rs b/quinn/src/endpoint.rs
index 83aceb625..0431a5434 100644
--- a/quinn/src/endpoint.rs
+++ b/quinn/src/endpoint.rs
@@ -15,10 +15,10 @@ use std::{
 use bytes::Bytes;
 use futures_channel::mpsc;
 use futures_util::StreamExt;
-use fxhash::FxHashMap;
 use proto::{
     self as proto, ClientConfig, ConnectError, ConnectionHandle, DatagramEvent, ServerConfig,
 };
+use rustc_hash::FxHashMap;
 use udp::{RecvMeta, UdpSocket, UdpState, BATCH_SIZE};
 
 use crate::{