From aaa6cabf3ab3112debe13ac73e2396f383d82188 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Mon, 1 Jul 2024 08:48:26 +0000
Subject: [PATCH] Update Rust crate dashmap to v6 (#12126)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Micha Reiser <micha@reiser.io>
---
 Cargo.lock                            | 20 +++++++++++++++++---
 Cargo.toml                            |  2 +-
 crates/red_knot/src/semantic/types.rs | 14 ++------------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index cf6857c3f2..e7c8dcb705 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -667,6 +667,20 @@ dependencies = [
  "parking_lot_core",
 ]
 
+[[package]]
+name = "dashmap"
+version = "6.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "804c8821570c3f8b70230c2ba75ffa5c0f9a4189b9a432b6656c536712acae28"
+dependencies = [
+ "cfg-if",
+ "crossbeam-utils",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core",
+]
+
 [[package]]
 name = "diff"
 version = "0.1.13"
@@ -1845,7 +1859,7 @@ dependencies = [
  "bitflags 2.6.0",
  "crossbeam",
  "ctrlc",
- "dashmap",
+ "dashmap 6.0.1",
  "hashbrown 0.14.5",
  "indexmap",
  "is-macro",
@@ -2073,7 +2087,7 @@ version = "0.0.0"
 dependencies = [
  "camino",
  "countme",
- "dashmap",
+ "dashmap 6.0.1",
  "filetime",
  "insta",
  "once_cell",
@@ -2621,7 +2635,7 @@ source = "git+https://github.com/salsa-rs/salsa.git?rev=a1bf3a613f451af7fc0a5941
 dependencies = [
  "arc-swap",
  "crossbeam",
- "dashmap",
+ "dashmap 5.5.3",
  "hashlink",
  "indexmap",
  "log",
diff --git a/Cargo.toml b/Cargo.toml
index cbc15378e1..01ab12f766 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -58,7 +58,7 @@ countme = { version = "3.0.1" }
 compact_str = "0.7.1"
 criterion = { version = "0.5.1", default-features = false }
 crossbeam = { version = "0.8.4" }
-dashmap = { version = "5.5.3" }
+dashmap = { version = "6.0.1" }
 drop_bomb = { version = "0.1.5" }
 env_logger = { version = "0.11.0" }
 etcetera = { version = "0.8.0" }
diff --git a/crates/red_knot/src/semantic/types.rs b/crates/red_knot/src/semantic/types.rs
index 1d0d8a798e..74960c4b50 100644
--- a/crates/red_knot/src/semantic/types.rs
+++ b/crates/red_knot/src/semantic/types.rs
@@ -348,19 +348,9 @@ impl TypeStore {
     }
 }
 
-type ModuleStoreRef<'a> = dashmap::mapref::one::Ref<
-    'a,
-    FileId,
-    ModuleTypeStore,
-    std::hash::BuildHasherDefault<rustc_hash::FxHasher>,
->;
+type ModuleStoreRef<'a> = dashmap::mapref::one::Ref<'a, FileId, ModuleTypeStore>;
 
-type ModuleStoreRefMut<'a> = dashmap::mapref::one::RefMut<
-    'a,
-    FileId,
-    ModuleTypeStore,
-    std::hash::BuildHasherDefault<rustc_hash::FxHasher>,
->;
+type ModuleStoreRefMut<'a> = dashmap::mapref::one::RefMut<'a, FileId, ModuleTypeStore>;
 
 #[derive(Debug)]
 pub(crate) struct FunctionTypeRef<'a> {