Merge pull request #178 from cuviper/release-1.6.2

Release 1.6.2

Author: cuviper

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "indexmap"
 edition = "2018"
-version = "1.6.1"
+version = "1.6.2"
 authors = [
 "bluss",
 "Josh Stone <[email protected]>"

README.rst

@@ -66,6 +66,17 @@ which is roughly:
 Recent Changes
 ==============
 
+- 1.6.2
+
+  - Fixed to match ``std`` behavior, ``OccupiedEntry::key`` now references the
+    existing key in the map instead of the lookup key, by @cuviper in PR 170_.
+
+  - The new ``Entry::or_insert_with_key`` matches Rust 1.50's ``Entry`` method,
+    passing ``&K`` to the callback to create a value, by @cuviper in PR 175_.
+
+.. _170: https://github.com/bluss/indexmap/pull/170
+.. _175: https://github.com/bluss/indexmap/pull/175
+
 - 1.6.1
 
   - The new ``serde_seq`` module implements ``IndexMap`` serialization as a

src/map.rs

@@ -1665,7 +1665,7 @@ mod tests {
                 let ptr = *e.key() as *const i32;
                 assert_eq!(ptr, k1_ptr);
                 assert_ne!(ptr, k2_ptr);
-            },
+            }
             Entry::Vacant(_) => panic!(),
         }
     }

src/map/core.rs

@@ -563,7 +563,7 @@ impl<K, V> OccupiedEntry<'_, K, V> {
     ///
     /// Like `Vec::swap_remove`, the pair is removed by swapping it with the
     /// last element of the map and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Computes in **O(1)** time (average).
     pub fn swap_remove(self) -> V {

src/map/core/raw.rs

@@ -152,7 +152,7 @@ impl<'a, K, V> OccupiedEntry<'a, K, V> {
     ///
     /// Like `Vec::swap_remove`, the pair is removed by swapping it with the
     /// last element of the map and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Computes in **O(1)** time (average).
     pub fn swap_remove_entry(self) -> (K, V) {

src/set.rs

@@ -425,7 +425,7 @@ where
     ///
     /// Like `Vec::swap_remove`, the value is removed by swapping it with the
     /// last element of the set and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Return `false` if `value` was not in the set.
     ///
@@ -473,7 +473,7 @@ where
     ///
     /// Like `Vec::swap_remove`, the value is removed by swapping it with the
     /// last element of the set and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Return `None` if `value` was not in the set.
     ///
@@ -506,7 +506,7 @@ where
     ///
     /// Like `Vec::swap_remove`, the value is removed by swapping it with the
     /// last element of the set and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Return `None` if `value` was not in the set.
     pub fn swap_remove_full<Q: ?Sized>(&mut self, value: &Q) -> Option<(usize, T)>
@@ -622,7 +622,7 @@ impl<T, S> IndexSet<T, S> {
     ///
     /// Like `Vec::swap_remove`, the value is removed by swapping it with the
     /// last element of the set and popping it off. **This perturbs
-    /// the postion of what used to be the last element!**
+    /// the position of what used to be the last element!**
     ///
     /// Computes in **O(1)** time (average).
     pub fn swap_remove_index(&mut self, index: usize) -> Option<T> {

test-nostd/src/lib.rs

@@ -11,7 +11,9 @@ use indexmap::IndexSet;
 struct BadHasher(u64);
 
 impl Hasher for BadHasher {
-    fn finish(&self) -> u64 { self.0 }
+    fn finish(&self) -> u64 {
+        self.0
+    }
     fn write(&mut self, bytes: &[u8]) {
         for &byte in bytes {
             self.0 += byte as u64