Make IndexMapCore fields private

Author: cuviper

src/map.rs

@@ -94,24 +94,22 @@ impl<K, V, S> Entries for IndexMap<K, V, S> {
     type Entry = Bucket<K, V>;
 
     fn into_entries(self) -> Vec<Self::Entry> {
-        self.core.entries
+        self.core.into_entries()
     }
 
     fn as_entries(&self) -> &[Self::Entry] {
-        &self.core.entries
+        self.core.as_entries()
     }
 
     fn as_entries_mut(&mut self) -> &mut [Self::Entry] {
-        &mut self.core.entries
+        self.core.as_entries_mut()
     }
 
     fn with_entries<F>(&mut self, f: F)
     where
         F: FnOnce(&mut [Self::Entry]),
     {
-        let side_index = self.core.save_hash_index();
-        f(&mut self.core.entries);
-        self.core.restore_hash_index(side_index);
+        self.core.with_entries(f);
     }
 }
 
@@ -282,36 +280,36 @@ where
     /// Return an iterator over the key-value pairs of the map, in their order
     pub fn iter(&self) -> Iter<K, V> {
         Iter {
-            iter: self.core.entries.iter(),
+            iter: self.as_entries().iter(),
         }
     }
 
     /// Return an iterator over the key-value pairs of the map, in their order
     pub fn iter_mut(&mut self) -> IterMut<K, V> {
         IterMut {
-            iter: self.core.entries.iter_mut(),
+            iter: self.as_entries_mut().iter_mut(),
         }
     }
 
     /// Return an iterator over the keys of the map, in their order
     pub fn keys(&self) -> Keys<K, V> {
         Keys {
-            iter: self.core.entries.iter(),
+            iter: self.as_entries().iter(),
         }
     }
 
     /// Return an iterator over the values of the map, in their order
     pub fn values(&self) -> Values<K, V> {
         Values {
-            iter: self.core.entries.iter(),
+            iter: self.as_entries().iter(),
         }
     }
 
     /// Return an iterator over mutable references to the the values of the map,
     /// in their order
     pub fn values_mut(&mut self) -> ValuesMut<K, V> {
         ValuesMut {
-            iter: self.core.entries.iter_mut(),
+            iter: self.as_entries_mut().iter_mut(),
         }
     }
 
@@ -342,7 +340,7 @@ where
         Q: Hash + Equivalent<K>,
     {
         if let Some(found) = self.get_index_of(key) {
-            let entry = &self.core.entries[found];
+            let entry = &self.as_entries()[found];
             Some((found, &entry.key, &entry.value))
         } else {
             None
@@ -383,7 +381,7 @@ where
         Q: Hash + Equivalent<K>,
     {
         if let Some((_, found)) = self.find(key) {
-            let entry = &mut self.core.entries[found];
+            let entry = &mut self.as_entries_mut()[found];
             Some((found, &mut entry.key, &mut entry.value))
         } else {
             None
@@ -557,19 +555,16 @@ where
     where
         F: FnMut(&K, &V, &K, &V) -> Ordering,
     {
-        self.core
-            .entries
+        self.as_entries_mut()
             .sort_by(move |a, b| cmp(&a.key, &a.value, &b.key, &b.value));
         self.into_iter()
     }
 
     /// Clears the `IndexMap`, returning all key-value pairs as a drain iterator.
     /// Keeps the allocated memory for reuse.
     pub fn drain(&mut self, range: RangeFull) -> Drain<K, V> {
-        self.core.clear_indices();
-
         Drain {
-            iter: self.core.entries.drain(range),
+            iter: self.core.drain(range),
         }
     }
 }
@@ -588,7 +583,7 @@ impl<K, V, S> IndexMap<K, V, S> {
     ///
     /// Computes in **O(1)** time.
     pub fn get_index(&self, index: usize) -> Option<(&K, &V)> {
-        self.core.entries.get(index).map(Bucket::refs)
+        self.as_entries().get(index).map(Bucket::refs)
     }
 
     /// Get a key-value pair by index
@@ -597,7 +592,7 @@ impl<K, V, S> IndexMap<K, V, S> {
     ///
     /// Computes in **O(1)** time.
     pub fn get_index_mut(&mut self, index: usize) -> Option<(&mut K, &mut V)> {
-        self.core.entries.get_mut(index).map(Bucket::muts)
+        self.as_entries_mut().get_mut(index).map(Bucket::muts)
     }
 
     /// Remove the key-value pair by index
@@ -611,8 +606,7 @@ impl<K, V, S> IndexMap<K, V, S> {
     /// Computes in **O(1)** time (average).
     pub fn swap_remove_index(&mut self, index: usize) -> Option<(K, V)> {
         let (probe, found) = match self
-            .core
-            .entries
+            .as_entries()
             .get(index)
             .map(|e| self.core.find_existing_entry(e))
         {
@@ -633,8 +627,7 @@ impl<K, V, S> IndexMap<K, V, S> {
     /// Computes in **O(n)** time (average).
     pub fn shift_remove_index(&mut self, index: usize) -> Option<(K, V)> {
         let (probe, found) = match self
-            .core
-            .entries
+            .as_entries()
             .get(index)
             .map(|e| self.core.find_existing_entry(e))
         {
@@ -933,7 +926,7 @@ where
     type IntoIter = IntoIter<K, V>;
     fn into_iter(self) -> Self::IntoIter {
         IntoIter {
-            iter: self.core.entries.into_iter(),
+            iter: self.into_entries().into_iter(),
         }
     }
 }

src/map_core.rs

@@ -17,9 +17,11 @@ use std::fmt;
 use std::iter::FromIterator;
 use std::marker::PhantomData;
 use std::mem::replace;
+use std::ops::RangeFull;
+use std::vec::Drain;
 
 use util::{enumerate, ptrdistance};
-use {Bucket, HashValue};
+use {Bucket, Entries, HashValue};
 
 /// Trait for the "size class". Either u32 or u64 depending on the index
 /// size needed to address an entry's index in self.core.entries.
@@ -146,7 +148,7 @@ impl<Sz> From<ShortHash<Sz>> for HashValue {
 /// appropriate. Only the growth code needs some extra logic to handle the
 /// transition from one class to another
 #[derive(Copy)]
-pub(crate) struct Pos {
+struct Pos {
     index: u64,
 }
 
@@ -368,11 +370,36 @@ enum Inserted<V> {
 /// Core of the map that does not depend on S
 #[derive(Clone)]
 pub(crate) struct IndexMapCore<K, V> {
-    pub(crate) mask: usize,
+    mask: usize,
     /// indices are the buckets. indices.len() == raw capacity
-    pub(crate) indices: Box<[Pos]>,
+    indices: Box<[Pos]>,
     /// entries is a dense vec of entries in their order. entries.len() == len
-    pub(crate) entries: Vec<Bucket<K, V>>,
+    entries: Vec<Bucket<K, V>>,
+}
+
+impl<K, V> Entries for IndexMapCore<K, V> {
+    type Entry = Bucket<K, V>;
+
+    fn into_entries(self) -> Vec<Self::Entry> {
+        self.entries
+    }
+
+    fn as_entries(&self) -> &[Self::Entry] {
+        &self.entries
+    }
+
+    fn as_entries_mut(&mut self) -> &mut [Self::Entry] {
+        &mut self.entries
+    }
+
+    fn with_entries<F>(&mut self, f: F)
+    where
+        F: FnOnce(&mut [Self::Entry]),
+    {
+        let side_index = self.save_hash_index();
+        f(&mut self.entries);
+        self.restore_hash_index(side_index);
+    }
 }
 
 impl<K, V> IndexMapCore<K, V> {
@@ -427,8 +454,13 @@ impl<K, V> IndexMapCore<K, V> {
         self.clear_indices();
     }
 
+    pub(crate) fn drain(&mut self, range: RangeFull) -> Drain<Bucket<K, V>> {
+        self.clear_indices();
+        self.entries.drain(range)
+    }
+
     // clear self.indices to the same state as "no elements"
-    pub(crate) fn clear_indices(&mut self) {
+    fn clear_indices(&mut self) {
         for pos in self.indices.iter_mut() {
             *pos = Pos::none();
         }
@@ -871,7 +903,7 @@ impl<K, V> IndexMapCore<K, V> {
         self.restore_hash_index(side_index);
     }
 
-    pub(crate) fn save_hash_index(&mut self) -> Vec<usize> {
+    fn save_hash_index(&mut self) -> Vec<usize> {
         // Temporarily use the hash field in a bucket to store the old index.
         // Save the old hash values in `side_index`.  Then we can sort
         // `self.entries` in place.
@@ -880,7 +912,7 @@ impl<K, V> IndexMapCore<K, V> {
         )
     }
 
-    pub(crate) fn restore_hash_index(&mut self, mut side_index: Vec<usize>) {
+    fn restore_hash_index(&mut self, mut side_index: Vec<usize>) {
         // Write back the hash values from side_index and fill `side_index` with
         // a mapping from the old to the new index instead.
         for (i, ent) in enumerate(&mut self.entries) {