Revert "Revert "Bump dashmap""

This reverts commit 39674cd.

Author: lnicola

Cargo.lock

@@ -11,7 +11,9 @@ doctest = false
 
 [dependencies]
 cov-mark = "2.0.0-pre.1"
-dashmap = { version = "4.0.2", features = ["raw-api"] }
+dashmap = { version = "5.0", features = ["raw-api"] }
+lock_api = "0.4"
+parking_lot = "0.12"
 tracing = "0.1"
 once_cell = "1.3.1"
 rustc-hash = "1.1.0"

crates/hir_def/Cargo.toml

@@ -10,15 +10,20 @@ use std::{
     sync::Arc,
 };
 
-use dashmap::{lock::RwLockWriteGuard, DashMap, SharedValue};
+use dashmap::{DashMap, SharedValue};
+use lock_api::RwLockWriteGuard;
 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<'static, HashMap<Arc<T>, SharedValue<()>, BuildHasherDefault<FxHasher>>>;
+type Guard<T> = RwLockWriteGuard<
+    'static,
+    RawRwLock,
+    HashMap<Arc<T>, SharedValue<()>, BuildHasherDefault<FxHasher>>,
+>;
 
 pub struct Interned<T: Internable + ?Sized> {
     arc: Arc<T>,

crates/hir_def/src/intern.rs

@@ -23,7 +23,7 @@ crossbeam-channel = "0.5.0"
 dissimilar = "1.0.2"
 itertools = "0.10.0"
 lsp-types = { version = "0.91", features = ["proposed"] }
-parking_lot = "0.11.0"
+parking_lot = "0.12"
 xflags = "0.2.1"
 oorandom = "11.1.2"
 rustc-hash = "1.1.0"