Auto merge of #12501 - Veykril:dashmap, r=Veykril

internal: Update dashmap and freeze its version

Author: bors

Cargo.lock

@@ -10,23 +10,23 @@ rust-version = "1.57"
 doctest = false
 
 [dependencies]
+anymap = "0.12.1"
+arrayvec = "0.7.2"
 bitflags = "1.3.2"
 cov-mark = "2.0.0-pre.1"
-dashmap = { version = "5.2.0", features = ["raw-api"] }
-lock_api = "0.4.6"
-parking_lot = "0.12.0"
-tracing = "0.1.32"
-once_cell = "1.10.0"
-rustc-hash = "1.1.0"
-either = "1.6.1"
-anymap = "0.12.1"
+# We need to freeze the version of the crate, as the raw-api feature is considered unstable
+dashmap = { version = "=5.3.4", features = ["raw-api"] }
 drop_bomb = "0.1.5"
+either = "1.6.1"
 fst = { version = "0.4.7", default-features = false }
-itertools = "0.10.3"
+hashbrown = { version = "0.12.1", default-features = false }
 indexmap = "1.8.0"
-smallvec = "1.8.0"
-arrayvec = "0.7.2"
+itertools = "0.10.3"
 la-arena = { version = "0.3.0", path = "../../lib/la-arena" }
+once_cell = "1.10.0"
+rustc-hash = "1.1.0"
+smallvec = "1.8.0"
+tracing = "0.1.32"
 
 stdx = { path = "../stdx", version = "0.0.0" }
 base-db = { path = "../base-db", version = "0.0.0" }

crates/hir-def/Cargo.toml

@@ -3,25 +3,22 @@
 //! Eventually this should probably be replaced with salsa-based interning.
 
 use std::{
-    collections::HashMap,
     fmt::{self, Debug, Display},
     hash::{BuildHasherDefault, Hash, Hasher},
     ops::Deref,
     sync::Arc,
 };
 
 use dashmap::{DashMap, SharedValue};
-use lock_api::RwLockWriteGuard;
+use hashbrown::HashMap;
 use once_cell::sync::OnceCell;
-use parking_lot::RawRwLock;
 use rustc_hash::FxHasher;
 
 use crate::generics::GenericParams;
 
 type InternMap<T> = DashMap<Arc<T>, (), BuildHasherDefault<FxHasher>>;
-type Guard<T> = RwLockWriteGuard<
+type Guard<T> = dashmap::RwLockWriteGuard<
     'static,
-    RawRwLock,
     HashMap<Arc<T>, SharedValue<()>, BuildHasherDefault<FxHasher>>,
 >;