Skip to content

Commit 39674cd

Browse files
committed
Revert "Bump dashmap"
This reverts commit 485f318.
1 parent dd05d12 commit 39674cd

File tree

3 files changed

+54
-74
lines changed

3 files changed

+54
-74
lines changed

Cargo.lock

Lines changed: 50 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

crates/hir_def/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ doctest = false
1111

1212
[dependencies]
1313
cov-mark = "2.0.0-pre.1"
14-
dashmap = { version = "5.0", features = ["raw-api"] }
15-
lock_api = "0.4"
16-
parking_lot = "0.11"
14+
dashmap = { version = "4.0.2", features = ["raw-api"] }
1715
tracing = "0.1"
1816
once_cell = "1.3.1"
1917
rustc-hash = "1.1.0"

crates/hir_def/src/intern.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,15 @@ use std::{
1010
sync::Arc,
1111
};
1212

13-
use dashmap::{DashMap, SharedValue};
14-
use lock_api::RwLockWriteGuard;
13+
use dashmap::{lock::RwLockWriteGuard, DashMap, SharedValue};
1514
use once_cell::sync::OnceCell;
16-
use parking_lot::RawRwLock;
1715
use rustc_hash::FxHasher;
1816

1917
use crate::generics::GenericParams;
2018

2119
type InternMap<T> = DashMap<Arc<T>, (), BuildHasherDefault<FxHasher>>;
22-
type Guard<T> = RwLockWriteGuard<
23-
'static,
24-
RawRwLock,
25-
HashMap<Arc<T>, SharedValue<()>, BuildHasherDefault<FxHasher>>,
26-
>;
20+
type Guard<T> =
21+
RwLockWriteGuard<'static, HashMap<Arc<T>, SharedValue<()>, BuildHasherDefault<FxHasher>>>;
2722

2823
pub struct Interned<T: Internable + ?Sized> {
2924
arc: Arc<T>,

0 commit comments

Comments
 (0)