Skip to content

Commit

Permalink
Fixed some locking woes and 3.4.2.
Browse files Browse the repository at this point in the history
  • Loading branch information
xacrimon committed Feb 6, 2020
1 parent c7edaf5 commit 190de84
Show file tree
Hide file tree
Showing 8 changed files with 529 additions and 10 deletions.
3 changes: 1 addition & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "dashmap"
version = "3.4.1"
version = "3.4.2"
authors = ["Acrimon <[email protected]>"]
edition = "2018"
license = "MIT"
Expand Down Expand Up @@ -43,7 +43,6 @@ name = "cht"
harness = false

[dependencies]
qadapt-spin = "1.0.1"
num_cpus = "1.11.1"
ahash = "0.3.1"
serde = { version = "1.0.104", optional = true, features = ["derive"] }
Expand Down
2 changes: 1 addition & 1 deletion src/iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use super::util;
use crate::t::Map;
use crate::util::SharedValue;
use crate::HashMap;
use parking_lot::{RwLockReadGuard, RwLockWriteGuard};
use crate::lock::{RwLockReadGuard, RwLockWriteGuard};
use std::collections::hash_map;
use std::hash::{BuildHasher, Hash};
use std::sync::Arc;
Expand Down
5 changes: 2 additions & 3 deletions src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
#![allow(clippy::type_complexity)]

extern crate qadapt_spin as parking_lot;

mod hasher;
pub mod iter;
pub mod mapref;
mod t;
mod util;
pub mod lock;

#[cfg(feature = "serde")]
mod serde;
Expand All @@ -18,7 +17,7 @@ use iter::{Iter, IterMut};
use mapref::entry::{Entry, OccupiedEntry, VacantEntry};
use mapref::multiple::RefMulti;
use mapref::one::{Ref, RefMut};
use parking_lot::{RwLock, RwLockReadGuard, RwLockWriteGuard};
use lock::{RwLock, RwLockReadGuard, RwLockWriteGuard};
use std::borrow::Borrow;
use std::fmt;
use std::hash::Hasher;
Expand Down
Loading

0 comments on commit 190de84

Please sign in to comment.