Merge pull request rust-lang#120 from bluss/get-index-of

Rename entry_index to get_index_of

src/map.rs

@@ -1023,16 +1023,16 @@ where
     where
         Q: Hash + Equivalent<K>,
     {
-        if let Some((_, found)) = self.find(key) {
+        if let Some(found) = self.get_index_of(key) {
             let entry = &self.core.entries[found];
             Some((found, &entry.key, &entry.value))
         } else {
             None
         }
     }
 
-    /// Return item index
-    pub fn entry_index<Q: ?Sized>(&self, key: &Q) -> Option<usize>
+    /// Return item index, if it exists in the map
+    pub fn get_index_of<Q: ?Sized>(&self, key: &Q) -> Option<usize>
     where
         Q: Hash + Equivalent<K>,
     {

src/set.rs

@@ -327,12 +327,12 @@ where
         self.map.get_full(value).map(|(i, x, &())| (i, x))
     }
 
-    /// Return item index
-    pub fn entry_index<Q: ?Sized>(&self, value: &Q) -> Option<usize>
+    /// Return item index, if it exists in the set
+    pub fn get_index_of<Q: ?Sized>(&self, value: &Q) -> Option<usize>
     where
         Q: Hash + Equivalent<T>,
     {
-        self.map.entry_index(value)
+        self.map.get_index_of(value)
     }
 
     /// Adds a value to the set, replacing the existing value, if any, that is