Update Rust crate dashmap to v6 (#12126)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Micha Reiser <micha@reiser.io>
This commit is contained in:
renovate[bot] 2024-07-01 08:48:26 +00:00 committed by GitHub
parent 9a4d9072c1
commit aaa6cabf3a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 16 deletions

20
Cargo.lock generated
View File

@ -667,6 +667,20 @@ dependencies = [
"parking_lot_core", "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]] [[package]]
name = "diff" name = "diff"
version = "0.1.13" version = "0.1.13"
@ -1845,7 +1859,7 @@ dependencies = [
"bitflags 2.6.0", "bitflags 2.6.0",
"crossbeam", "crossbeam",
"ctrlc", "ctrlc",
"dashmap", "dashmap 6.0.1",
"hashbrown 0.14.5", "hashbrown 0.14.5",
"indexmap", "indexmap",
"is-macro", "is-macro",
@ -2073,7 +2087,7 @@ version = "0.0.0"
dependencies = [ dependencies = [
"camino", "camino",
"countme", "countme",
"dashmap", "dashmap 6.0.1",
"filetime", "filetime",
"insta", "insta",
"once_cell", "once_cell",
@ -2621,7 +2635,7 @@ source = "git+https://github.com/salsa-rs/salsa.git?rev=a1bf3a613f451af7fc0a5941
dependencies = [ dependencies = [
"arc-swap", "arc-swap",
"crossbeam", "crossbeam",
"dashmap", "dashmap 5.5.3",
"hashlink", "hashlink",
"indexmap", "indexmap",
"log", "log",

View File

@ -58,7 +58,7 @@ countme = { version = "3.0.1" }
compact_str = "0.7.1" compact_str = "0.7.1"
criterion = { version = "0.5.1", default-features = false } criterion = { version = "0.5.1", default-features = false }
crossbeam = { version = "0.8.4" } crossbeam = { version = "0.8.4" }
dashmap = { version = "5.5.3" } dashmap = { version = "6.0.1" }
drop_bomb = { version = "0.1.5" } drop_bomb = { version = "0.1.5" }
env_logger = { version = "0.11.0" } env_logger = { version = "0.11.0" }
etcetera = { version = "0.8.0" } etcetera = { version = "0.8.0" }

View File

@ -348,19 +348,9 @@ impl TypeStore {
} }
} }
type ModuleStoreRef<'a> = dashmap::mapref::one::Ref< type ModuleStoreRef<'a> = dashmap::mapref::one::Ref<'a, FileId, ModuleTypeStore>;
'a,
FileId,
ModuleTypeStore,
std::hash::BuildHasherDefault<rustc_hash::FxHasher>,
>;
type ModuleStoreRefMut<'a> = dashmap::mapref::one::RefMut< type ModuleStoreRefMut<'a> = dashmap::mapref::one::RefMut<'a, FileId, ModuleTypeStore>;
'a,
FileId,
ModuleTypeStore,
std::hash::BuildHasherDefault<rustc_hash::FxHasher>,
>;
#[derive(Debug)] #[derive(Debug)]
pub(crate) struct FunctionTypeRef<'a> { pub(crate) struct FunctionTypeRef<'a> {