Merge branch 'dashmap_v4'

vitorenesduarte · Dec 26, 2020 · 3493de2 · 3493de2
2 parents 3977193 + 420cdba
commit 3493de2
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/fantoch/Cargo.toml b/fantoch/Cargo.toml
@@ -19,7 +19,7 @@ ahash = "0.6.2"
 bincode = "1.3.1"
 bytes = "1.0.0"
 color-eyre = "0.5.10"
-dashmap = { git = "https://github.com/vitorenesduarte/dashmap", rev = "82deaa28771f225d3969b451fee30a3b9047514b" }
+dashmap = "4.0.0"
 flate2 = "1.0.19"
 futures = { version = "0.3.8", default-features = false, features = ["alloc"] }
 griddle = { version = "0.4.1", features = ["serde"], optional = true }

diff --git a/fantoch/src/shared.rs b/fantoch/src/shared.rs
@@ -1,7 +1,7 @@
-use ahash::RandomState;
 use dashmap::iter::Iter;
 use dashmap::mapref::one::Ref;
 use dashmap::DashMap;
+use std::collections::hash_map::RandomState;
 use std::collections::BTreeSet;
 use std::hash::Hash;
 

diff --git a/fantoch_prof/Cargo.toml b/fantoch_prof/Cargo.toml
@@ -7,7 +7,7 @@ authors = ["Vitor Enes <vitorenesduarte@gmail.com>"]
 license = "MIT/Apache-2.0"
 
 [dependencies]
-dashmap = { git = "https://github.com/vitorenesduarte/dashmap", rev = "4cabdf423002be85fe5ecbf7308dbd9754d33011" }
+dashmap = "4.0.0"
 jemallocator = "0.3.2"
 quanta = "0.6.5"
 serde = { version = "1.0.118", features = ["derive"] }