Merge pull request #34 from GnomedDev/dashmap-6

[sync] Update to DashMap 6

.github/workflows/CI.yml

@@ -24,7 +24,7 @@ jobs:
         rust:
           - stable
           - beta
-          - 1.61.0  # MSRV
+          - 1.76.0  # MSRV
           - nightly # For checking minimum version dependencies.
 
     steps:
@@ -42,10 +42,6 @@ jobs:
         if: ${{ matrix.rust == 'nightly' }}
         run: cargo update -Z minimal-versions
 
-      - name: Pin some dependencies to specific versions (MSRV only)
-        if: ${{ matrix.rust == '1.61.0' }}
-        run: ./.ci_extras/pin-crate-vers-msrv.sh
-
       - name: Show cargo tree
         run: cargo tree
 

.github/workflows/LinuxCrossCompileTest.yml

@@ -3,19 +3,19 @@ name: Linux cross compile tests
 on:
   push:
     paths-ignore:
-    - '.devcontainer/**'
-    - '.gitpod.yml'
-    - '.vscode/**'
-    - 'tests/**'
+      - ".devcontainer/**"
+      - ".gitpod.yml"
+      - ".vscode/**"
+      - "tests/**"
   pull_request:
     paths-ignore:
-    - '.devcontainer/**'
-    - '.gitpod.yml'
-    - '.vscode/**'
-    - 'tests/**'
+      - ".devcontainer/**"
+      - ".gitpod.yml"
+      - ".vscode/**"
+      - "tests/**"
   schedule:
     # Run against the last commit on the default branch on Friday at 9pm (UTC?)
-    - cron:  '0 21 * * 5'
+    - cron: "0 21 * * 5"
 
 jobs:
   linux-cross:
@@ -32,12 +32,6 @@ jobs:
             rust-version: stable
           - target: armv5te-unknown-linux-musleabi
             rust-version: stable
-          - target: mips-unknown-linux-musl
-            rust-version: "1.72.1"
-            cargo-version: "+1.72.1"
-          - target: mipsel-unknown-linux-musl
-            rust-version: "1.72.1"
-            cargo-version: "+1.72.1"
 
     steps:
       - name: Checkout Mini Moka

Cargo.toml

@@ -2,7 +2,7 @@
 name = "mini-moka"
 version = "0.10.3"
 edition = "2018"
-rust-version = "1.61"
+rust-version = "1.76"
 
 description = "A lighter edition of Moka, a fast and concurrent cache library"
 license = "MIT OR Apache-2.0"
@@ -29,11 +29,10 @@ tagptr = "0.2"
 
 # Opt-out serde and stable_deref_trait features
 # https://github.com/Manishearth/triomphe/pull/5
-# 0.1.12 requires Rust 1.76
-triomphe = { version = ">=0.1.3, <0.1.12", default-features = false }
+triomphe = { version = "0.1.13", default-features = false }
 
 # Optional dependencies (enabled by default)
-dashmap = { version = "5.2", optional = true }
+dashmap = { version = "6.1", optional = true }
 
 [dev-dependencies]
 anyhow = "1.0.19"

README.md

@@ -270,7 +270,7 @@ Mini Moka's minimum supported Rust versions (MSRV) are the followings:
 
 | Feature          | MSRV                       |
 |:-----------------|:--------------------------:|
-| default features | Rust 1.61.0 (May 19, 2022) |
+| default features | Rust 1.76.0 (Feb 8, 2024)  |
 
 It will keep a rolling MSRV policy of at least 6 months. If only the default features
 are enabled, MSRV will be updated conservatively. When using other features, MSRV

src/lib.rs

@@ -51,7 +51,7 @@
 //!
 //! | Feature          | MSRV                       |
 //! |:-----------------|:--------------------------:|
-//! | default features | Rust 1.61.0 (May 19, 2022) |
+//! | default features | Rust 1.76.0 (Feb 8, 2024) |
 //!
 //! If only the default features are enabled, MSRV will be updated conservatively.
 //! When using other features, MSRV might be updated more frequently, up to the

src/sync/base_cache.rs

@@ -477,7 +477,7 @@ enum AdmissionResult<K> {
 
 type CacheStore<K, V, S> = dashmap::DashMap<Arc<K>, TrioArc<ValueEntry<K, V>>, S>;
 
-type CacheEntryRef<'a, K, V, S> = DashMapRef<'a, Arc<K>, TrioArc<ValueEntry<K, V>>, S>;
+type CacheEntryRef<'a, K, V> = DashMapRef<'a, Arc<K>, TrioArc<ValueEntry<K, V>>>;
 
 // Define a type alias to avoid clippy::type_complexity warnings.
 type RemovedEntry<K, V> = (Arc<K>, TrioArc<ValueEntry<K, V>>);
@@ -583,7 +583,7 @@ where
     }
 
     #[inline]
-    fn get<Q>(&self, key: &Q) -> Option<CacheEntryRef<'_, K, V, S>>
+    fn get<Q>(&self, key: &Q) -> Option<CacheEntryRef<'_, K, V>>
     where
         Arc<K>: Borrow<Q>,
         Q: Hash + Eq + ?Sized,

src/sync/cache.rs

@@ -586,7 +586,7 @@ where
     V: 'a,
     S: BuildHasher + Clone,
 {
-    type Item = EntryRef<'a, K, V, S>;
+    type Item = EntryRef<'a, K, V>;
 
     type IntoIter = Iter<'a, K, V, S>;
 

src/sync/iter.rs

@@ -26,7 +26,7 @@ where
     K: Eq + Hash,
     S: BuildHasher + Clone,
 {
-    type Item = EntryRef<'a, K, V, S>;
+    type Item = EntryRef<'a, K, V>;
 
     fn next(&mut self) -> Option<Self::Item> {
         for map_ref in &mut self.map_iter {

src/sync/mapref.rs

@@ -1,30 +1,25 @@
 use crate::common::concurrent::ValueEntry;
 
-use std::{
-    hash::{BuildHasher, Hash},
-    sync::Arc,
-};
+use std::{hash::Hash, sync::Arc};
 use triomphe::Arc as TrioArc;
 
-type DashMapRef<'a, K, V, S> =
-    dashmap::mapref::multiple::RefMulti<'a, Arc<K>, TrioArc<ValueEntry<K, V>>, S>;
+type DashMapRef<'a, K, V> =
+    dashmap::mapref::multiple::RefMulti<'a, Arc<K>, TrioArc<ValueEntry<K, V>>>;
 
-pub struct EntryRef<'a, K, V, S>(DashMapRef<'a, K, V, S>);
+pub struct EntryRef<'a, K, V>(DashMapRef<'a, K, V>);
 
-unsafe impl<'a, K, V, S> Sync for EntryRef<'a, K, V, S>
+unsafe impl<'a, K, V> Sync for EntryRef<'a, K, V>
 where
     K: Eq + Hash + Send + Sync,
     V: Send + Sync,
-    S: BuildHasher,
 {
 }
 
-impl<'a, K, V, S> EntryRef<'a, K, V, S>
+impl<'a, K, V> EntryRef<'a, K, V>
 where
     K: Eq + Hash,
-    S: BuildHasher + Clone,
 {
-    pub(crate) fn new(map_ref: DashMapRef<'a, K, V, S>) -> Self {
+    pub(crate) fn new(map_ref: DashMapRef<'a, K, V>) -> Self {
         Self(map_ref)
     }
 
@@ -41,10 +36,9 @@ where
     }
 }
 
-impl<'a, K, V, S> std::ops::Deref for EntryRef<'a, K, V, S>
+impl<'a, K, V> std::ops::Deref for EntryRef<'a, K, V>
 where
     K: Eq + Hash,
-    S: BuildHasher + Clone,
 {
     type Target = V;