From bcd972fbb46458418c2d1b7d017df0f35359ce5b Mon Sep 17 00:00:00 2001
From: Marshall Bowers <elliott.codes@gmail.com>
Date: Fri, 26 Jul 2024 17:58:37 -0400
Subject: [PATCH] Upgrade `dashmap` to v6 (#15305)

This PR upgrades `dashmap` to v6.0.1.

Release Notes:

- N/A
---
 Cargo.lock               | 18 ++++++++++++++++--
 Cargo.toml               |  2 +-
 crates/collab/Cargo.toml |  2 +-
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 8db15bb643..014eb884df 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2459,7 +2459,7 @@ dependencies = [
  "collections",
  "completion",
  "ctor",
- "dashmap",
+ "dashmap 6.0.1",
  "dev_server_projects",
  "editor",
  "env_logger",
@@ -3255,6 +3255,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 = "dasp_sample"
 version = "0.11.0"
@@ -14011,7 +14025,7 @@ dependencies = [
  "asynchronous-codec",
  "bytes 1.5.0",
  "crossbeam-queue",
- "dashmap",
+ "dashmap 5.5.3",
  "futures-channel",
  "futures-io",
  "futures-task",
diff --git a/Cargo.toml b/Cargo.toml
index fe1473a8cd..b289d083bb 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -330,7 +330,7 @@ cocoa = "0.25"
 core-foundation = "0.9.3"
 core-foundation-sys = "0.8.6"
 ctor = "0.2.6"
-dashmap = "5.5.3"
+dashmap = "6.0"
 derive_more = "0.99.17"
 dirs = "4.0"
 emojis = "0.6.1"
diff --git a/crates/collab/Cargo.toml b/crates/collab/Cargo.toml
index 54158fbd5d..b321c4b95f 100644
--- a/crates/collab/Cargo.toml
+++ b/crates/collab/Cargo.toml
@@ -30,7 +30,7 @@ chrono.workspace = true
 clock.workspace = true
 clickhouse.workspace = true
 collections.workspace = true
-dashmap = "5.4"
+dashmap.workspace = true
 envy = "0.4.2"
 futures.workspace = true
 google_ai.workspace = true