Merge pull request #243 from cuviper/hashbrown-0.13

Upgrade to hashbrown 0.13 (MSRV 1.61)

Author: cuviper

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - rust: 1.56.0 # MSRV
+          - rust: 1.61.0 # MSRV
             features:
           - rust: stable
             features: serde
@@ -55,7 +55,7 @@ jobs:
     strategy:
       matrix:
         include:
-          - rust: 1.56.0
+          - rust: 1.61.0
             target: thumbv6m-none-eabi
           - rust: stable
             target: thumbv6m-none-eabi

Cargo.toml

@@ -9,7 +9,7 @@ license = "Apache-2.0 OR MIT"
 description = "A hash table with consistent order and fast iteration."
 keywords = ["hashmap", "no_std"]
 categories = ["data-structures", "no-std"]
-rust-version = "1.56"
+rust-version = "1.61"
 
 [lib]
 bench = false
@@ -23,7 +23,7 @@ rayon = { version = "1.4.1", optional = true }
 rustc-rayon = { version = "0.4", optional = true }
 
 [dependencies.hashbrown]
-version = "0.12"
+version = "0.13"
 default-features = false
 features = ["raw"]
 

README.md

@@ -3,7 +3,7 @@
 [![build status](https://github.com/bluss/indexmap/workflows/Continuous%20integration/badge.svg?branch=master)](https://github.com/bluss/indexmap/actions)
 [![crates.io](https://img.shields.io/crates/v/indexmap.svg)](https://crates.io/crates/indexmap)
 [![docs](https://docs.rs/indexmap/badge.svg)](https://docs.rs/indexmap)
-[![rustc](https://img.shields.io/badge/rust-1.56%2B-orange.svg)](https://img.shields.io/badge/rust-1.56%2B-orange.svg)
+[![rustc](https://img.shields.io/badge/rust-1.61%2B-orange.svg)](https://img.shields.io/badge/rust-1.61%2B-orange.svg)
 
 A pure-Rust hash table which preserves (in a limited sense) insertion order.
 

RELEASES.md

@@ -1,5 +1,7 @@
 - 2.0.0 (pending)
 
+  - **MSRV**: Rust 1.61.0 or later is now required.
+
   - The `"std"` feature is no longer auto-detected. It is included in the
     default feature set, or else can be enabled like any other Cargo feature.
 
@@ -15,6 +17,8 @@
     comparison traits like `Eq` only consider items in order, rather than hash
     lookups, and slices even implement `Hash`.
 
+  - The `hashbrown` dependency has been updated to version 0.13.
+
 - 1.9.1
 
   - The MSRV now allows Rust 1.56.0 as well. However, currently `hashbrown`

src/lib.rs

@@ -53,7 +53,7 @@
 //!
 //! ### Rust Version
 //!
-//! This version of indexmap requires Rust 1.56 or later.
+//! This version of indexmap requires Rust 1.61 or later.
 //!
 //! The indexmap 2.x release series will use a carefully considered version
 //! upgrade policy, where in a later 2.x version, we will raise the minimum

src/map/core/raw.rs

@@ -26,7 +26,7 @@ pub(super) struct DebugIndices<'a>(pub &'a RawTable<usize>);
 impl fmt::Debug for DebugIndices<'_> {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         // SAFETY: we're not letting any of the buckets escape this function
-        let indices = unsafe { self.0.iter().map(|raw_bucket| raw_bucket.read()) };
+        let indices = unsafe { self.0.iter().map(|raw_bucket| *raw_bucket.as_ref()) };
         f.debug_list().entries(indices).finish()
     }
 }
@@ -38,10 +38,10 @@ impl<K, V> IndexMapCore<K, V> {
         unsafe {
             let offset = end - start;
             for bucket in self.indices.iter() {
-                let i = bucket.read();
-                if i >= end {
-                    bucket.write(i - offset);
-                } else if i >= start {
+                let i = bucket.as_mut();
+                if *i >= end {
+                    *i -= offset;
+                } else if *i >= start {
                     self.indices.erase(bucket);
                 }
             }
@@ -92,8 +92,8 @@ impl<K, V> IndexMapCore<K, V> {
         unsafe {
             let raw_bucket_a = self.find_index(a);
             let raw_bucket_b = self.find_index(b);
-            raw_bucket_a.write(b);
-            raw_bucket_b.write(a);
+            *raw_bucket_a.as_mut() = b;
+            *raw_bucket_b.as_mut() = a;
         }
         self.entries.swap(a, b);
     }
@@ -151,7 +151,7 @@ impl<'a, K, V> OccupiedEntry<'a, K, V> {
     #[inline]
     pub fn index(&self) -> usize {
         // SAFETY: we have &mut map keep keeping the bucket stable
-        unsafe { self.raw_bucket.read() }
+        unsafe { *self.raw_bucket.as_ref() }
     }
 
     /// Converts into a mutable reference to the entry's value in the map,