Merge #11415

11415: Downgrade `dashmap` and bump `thread_local` r=lnicola a=lnicola Closes #11341 bors r+ Co-authored-by: Laurențiu Nicola <[email protected]>
rust-lang · Feb 5, 2022 · 6689470 · 6689470
2 parents dd05d12 + d0f371c
commit 6689470
Show file tree

Hide file tree

Showing 3 changed files with 54 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/hir_def/Cargo.toml b/crates/hir_def/Cargo.toml
@@ -11,9 +11,7 @@ doctest = false
 
 [dependencies]
 cov-mark = "2.0.0-pre.1"
-dashmap = { version = "5.0", features = ["raw-api"] }
-lock_api = "0.4"
-parking_lot = "0.11"
+dashmap = { version = "4.0.2", features = ["raw-api"] }
 tracing = "0.1"
 once_cell = "1.3.1"
 rustc-hash = "1.1.0"

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