diff --git a/Cargo.lock b/Cargo.lock index 2f6d7291b..7791e1cc4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -287,16 +287,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "chashmap" -version = "2.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff41a3c2c1e39921b9003de14bf0439c7b63a9039637c291e1a64925d8ddfa45" -dependencies = [ - "owning_ref", - "parking_lot 0.4.8", -] - [[package]] name = "chrono" version = "0.4.39" @@ -553,6 +543,20 @@ dependencies = [ "petgraph", ] +[[package]] +name = "dashmap" +version = "6.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5041cc499144891f3790297212f32a74fb938e5136a14943f338ef9e0ae276cf" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", +] + [[package]] name = "deflate64" version = "0.1.9" @@ -768,12 +772,6 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "futures-channel" version = "0.3.31" @@ -905,6 +903,12 @@ dependencies = [ "crunchy", ] +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + [[package]] name = "hashbrown" version = "0.15.2" @@ -1006,7 +1010,7 @@ dependencies = [ "httpdate", "itoa", "pin-project-lite", - "smallvec 1.13.2", + "smallvec", "tokio", "want", ] @@ -1142,7 +1146,7 @@ dependencies = [ "icu_normalizer_data", "icu_properties", "icu_provider", - "smallvec 1.13.2", + "smallvec", "utf16_iter", "utf8_iter", "write16", @@ -1211,7 +1215,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e" dependencies = [ "idna_adapter", - "smallvec 1.13.2", + "smallvec", "utf8_iter", ] @@ -1252,7 +1256,7 @@ dependencies = [ "imageflow_helpers", "libc", "regex", - "smallvec 1.13.2", + "smallvec", ] [[package]] @@ -1276,10 +1280,10 @@ dependencies = [ "blake2-rfc", "bytemuck", "byteorder", - "chashmap", "chrono", "criterion", "daggy", + "dashmap", "dssim", "evalchroma", "flate2", @@ -1310,14 +1314,14 @@ dependencies = [ "multiversion", "num 0.4.3", "petgraph", - "rand 0.8.5", + "rand", "rgb", "rustface", "serde", "serde_derive", "serde_json", "slotmap", - "smallvec 1.13.2", + "smallvec", "threadpool", "time", "twox-hash", @@ -1340,14 +1344,14 @@ dependencies = [ "libc", "mimalloc", "mockito", - "rand 0.8.5", + "rand", "regex", "rgb", "serde", "serde_derive", "serde_json", "sha2", - "smallvec 1.13.2", + "smallvec", "time", "twox-hash", "unicase", @@ -1438,7 +1442,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8c9c992b02b5b4c94ea26e32fe5bccb7aa7d9f390ab5c1221ff895bc7ea8b652" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.15.2", ] [[package]] @@ -1681,12 +1685,6 @@ name = "macro-attr" version = "0.2.1" source = "git+https://github.com/DanielKeep/rust-custom-derive.git#1252f258cdb9b7c9867f937c52c2f5c0e69a9c03" -[[package]] -name = "maybe-uninit" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" - [[package]] name = "memchr" version = "2.7.4" @@ -1744,7 +1742,7 @@ dependencies = [ "hyper", "hyper-util", "log", - "rand 0.8.5", + "rand", "regex", "serde_json", "serde_urlencoded", @@ -2053,25 +2051,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4f0bc569ca0974cb90125f52cf76f7b6ad3a072301beba78eb0aa4174c4964ed" -[[package]] -name = "owning_ref" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdf84f41639e037b484f93433aa3897863b561ed65c6e59c7073d7c561710f37" -dependencies = [ - "stable_deref_trait", -] - -[[package]] -name = "parking_lot" -version = "0.4.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e" -dependencies = [ - "owning_ref", - "parking_lot_core 0.2.14", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -2079,19 +2058,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.10", -] - -[[package]] -name = "parking_lot_core" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa" -dependencies = [ - "libc", - "rand 0.4.6", - "smallvec 0.6.14", - "winapi", + "parking_lot_core", ] [[package]] @@ -2103,7 +2070,7 @@ dependencies = [ "cfg-if", "libc", "redox_syscall", - "smallvec 1.13.2", + "smallvec", "windows-targets", ] @@ -2218,19 +2185,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - [[package]] name = "rand" version = "0.8.5" @@ -2239,7 +2193,7 @@ checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha", - "rand_core 0.6.4", + "rand_core", ] [[package]] @@ -2249,24 +2203,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.4", -] - -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", + "rand_core", ] -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.6.4" @@ -2296,15 +2235,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.5.8" @@ -2671,15 +2601,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "smallvec" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97fcaeba89edba30f044a10c6a3cc39df9c3f17d7cd829dd1446cab35f890e0" -dependencies = [ - "maybe-uninit", -] - [[package]] name = "smallvec" version = "1.13.2" @@ -2880,7 +2801,7 @@ dependencies = [ "bytes", "libc", "mio", - "parking_lot 0.12.3", + "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2", @@ -3024,7 +2945,7 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7b17f197b3050ba473acf9181f7b1d3b66d1cf7356c6cc57886662276e65908" dependencies = [ - "rand 0.8.5", + "rand", ] [[package]] @@ -3220,22 +3141,6 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082" -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - [[package]] name = "winapi-util" version = "0.1.9" @@ -3245,12 +3150,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - [[package]] name = "windows-core" version = "0.52.0" @@ -3521,7 +3420,7 @@ dependencies = [ "lzma-rs", "memchr", "pbkdf2", - "rand 0.8.5", + "rand", "sha1", "thiserror", "time", diff --git a/imageflow_core/Cargo.toml b/imageflow_core/Cargo.toml index 33857764d..990cbba1c 100644 --- a/imageflow_core/Cargo.toml +++ b/imageflow_core/Cargo.toml @@ -49,7 +49,7 @@ jpeg-decoder ="0.3.1" lcms2 = "6" lcms2-sys = "4" -chashmap = "2.2" +dashmap = "6.1.0" getopts ="0.2" byteorder="1" diff --git a/imageflow_core/src/codecs/color_transform_cache.rs b/imageflow_core/src/codecs/color_transform_cache.rs index d667df618..2638d986b 100644 --- a/imageflow_core/src/codecs/color_transform_cache.rs +++ b/imageflow_core/src/codecs/color_transform_cache.rs @@ -55,8 +55,8 @@ pub struct ColorTransformCache{ } lazy_static!{ - static ref PROFILE_TRANSFORMS: ::chashmap::CHashMap> = ::chashmap::CHashMap::with_capacity(4); - static ref GAMA_TRANSFORMS: ::chashmap::CHashMap> = ::chashmap::CHashMap::with_capacity(4); + static ref PROFILE_TRANSFORMS: ::dashmap::DashMap> = ::dashmap::DashMap::with_capacity(4); + static ref GAMA_TRANSFORMS: ::dashmap::DashMap> = ::dashmap::DashMap::with_capacity(4); } diff --git a/imageflow_core/src/lib.rs b/imageflow_core/src/lib.rs index f42c61607..0fa50693c 100644 --- a/imageflow_core/src/lib.rs +++ b/imageflow_core/src/lib.rs @@ -35,7 +35,7 @@ extern crate uuid; extern crate imagequant; extern crate gif; extern crate smallvec; -extern crate chashmap; +extern crate dashmap; extern crate rgb; extern crate imgref; extern crate lodepng; diff --git a/imageflow_helpers/src/unused/cache.rs b/imageflow_helpers/src/unused/cache.rs index 63b921ade..852d158e4 100644 --- a/imageflow_helpers/src/unused/cache.rs +++ b/imageflow_helpers/src/unused/cache.rs @@ -155,7 +155,7 @@ pub trait PersistentStringCache: Sync + Send{ pub struct WriteThroughCache{ prefix: &'static str, // Would be nice if we could lookup by &str instead of &String - cache: ::chashmap::CHashMap, + cache: ::dashmap::DashMap, disk: &'static DiskStorage } @@ -164,7 +164,7 @@ impl WriteThroughCache{ pub fn new(prefix: &'static str, disk: &'static DiskStorage) -> Self{ WriteThroughCache{ prefix, - cache: ::chashmap::CHashMap::new(), + cache: ::dashmap::DashMap::new(), disk } } diff --git a/imageflow_helpers/src/unused/mod.rs b/imageflow_helpers/src/unused/mod.rs index 86eaf8265..acd5d030e 100644 --- a/imageflow_helpers/src/unused/mod.rs +++ b/imageflow_helpers/src/unused/mod.rs @@ -107,8 +107,8 @@ impl Endpoint for LicenseEndpoint{ pub struct LicenseManagerSingleton{ licenses: AppendList, - aliases_to_id: ::chashmap::CHashMap,String>, - cached: ::chashmap::CHashMap,LicenseBlob>, + aliases_to_id: ::dashmap::DashMap,String>, + cached: ::dashmap::DashMap,LicenseBlob>, #[allow(dead_code)] sink: IssueSink, trusted_keys: &'static [RSADecryptPublic], @@ -141,8 +141,8 @@ impl LicenseManagerSingleton{ trusted_keys, clock, cache, - cached: ::chashmap::CHashMap::new(), - aliases_to_id: ::chashmap::CHashMap::new(), + cached: ::dashmap::DashMap::new(), + aliases_to_id: ::dashmap::DashMap::new(), licenses: AppendList::new(), sink: IssueSink::new("LicenseManager"), created, @@ -236,7 +236,7 @@ impl LicenseManagerSingleton{ self.licenses.iter().find(|l| l.id().eq_ignore_ascii_case(id)) } - pub fn cached_remote(&self, id: &str) -> Option<::chashmap::ReadGuard,LicenseBlob>>{ + pub fn cached_remote(&self, id: &str) -> Option<::dashmap::ReadGuard,LicenseBlob>>{ // self.cached.get(&Cow::Owned(id.to_owned())) diff --git a/imageflow_helpers/src/unused/support.rs b/imageflow_helpers/src/unused/support.rs index 3511d088e..f37b22172 100644 --- a/imageflow_helpers/src/unused/support.rs +++ b/imageflow_helpers/src/unused/support.rs @@ -48,13 +48,13 @@ impl fmt::Display for IssueSink { //#[allow(dead_code)] //pub struct IssueSync{ // source: &'static str, -// dict: ::chashmap::CHashMap +// dict: ::dashmap::DashMap //} //impl IssueSync { // pub fn new(source: &'static str) -> Self { // IssueSync { // source, -// dict: ::chashmap::CHashMap::new() +// dict: ::dashmap::DashMap::new() // } // } // pub fn error(&self, msg: String, detail: String) { diff --git a/imageflow_helpers/src/unused/test/support.rs b/imageflow_helpers/src/unused/test/support.rs index dd0572bdd..4547be678 100644 --- a/imageflow_helpers/src/unused/test/support.rs +++ b/imageflow_helpers/src/unused/test/support.rs @@ -44,12 +44,12 @@ impl AppClock for OffsetClock{ } pub struct StringMemCache{ - cache: ::chashmap::CHashMap, + cache: ::dashmap::DashMap, } impl StringMemCache{ pub fn new() -> Self{ StringMemCache{ - cache: ::chashmap::CHashMap::new() + cache: ::dashmap::DashMap::new() } } pub fn into_cache(self) -> Box{