From 929ecb067db450656d58db13e63410d992de22ab Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Tue, 8 Feb 2022 12:07:08 -0800
Subject: [PATCH] Remove crate::util::enumerate

(cherry picked from commit bdd93a379955a250c4629e86cc46ec2ae2848ebf)
---
 src/map.rs  |  7 +++----
 src/set.rs  | 11 +++++------
 src/util.rs |  8 --------
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/src/map.rs b/src/map.rs
index c810670..9e4d111 100644
--- a/src/map.rs
+++ b/src/map.rs
@@ -1495,7 +1495,6 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::util::enumerate;
     use std::string::String;
 
     #[test]
@@ -1524,7 +1523,7 @@ mod tests {
         let not_present = [1, 3, 6, 9, 10];
         let mut map = IndexMap::with_capacity(insert.len());
 
-        for (i, &elt) in enumerate(&insert) {
+        for (i, &elt) in insert.iter().enumerate() {
             assert_eq!(map.len(), i);
             map.insert(elt, elt);
             assert_eq!(map.len(), i + 1);
@@ -1544,7 +1543,7 @@ mod tests {
         let present = vec![1, 6, 2];
         let mut map = IndexMap::with_capacity(insert.len());
 
-        for (i, &elt) in enumerate(&insert) {
+        for (i, &elt) in insert.iter().enumerate() {
             assert_eq!(map.len(), i);
             let (index, existing) = map.insert_full(elt, elt);
             assert_eq!(existing, None);
@@ -1611,7 +1610,7 @@ mod tests {
         let not_present = [1, 3, 6, 9, 10];
         let mut map = IndexMap::with_capacity(insert.len());
 
-        for (i, &elt) in enumerate(&insert) {
+        for (i, &elt) in insert.iter().enumerate() {
             assert_eq!(map.len(), i);
             map.insert(elt, elt);
             assert_eq!(map.len(), i + 1);
diff --git a/src/set.rs b/src/set.rs
index 36e8c9f..ca47553 100644
--- a/src/set.rs
+++ b/src/set.rs
@@ -1366,7 +1366,6 @@ where
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::util::enumerate;
     use std::string::String;
 
     #[test]
@@ -1395,7 +1394,7 @@ mod tests {
         let not_present = [1, 3, 6, 9, 10];
         let mut set = IndexSet::with_capacity(insert.len());
 
-        for (i, &elt) in enumerate(&insert) {
+        for (i, &elt) in insert.iter().enumerate() {
             assert_eq!(set.len(), i);
             set.insert(elt);
             assert_eq!(set.len(), i + 1);
@@ -1414,7 +1413,7 @@ mod tests {
         let present = vec![1, 6, 2];
         let mut set = IndexSet::with_capacity(insert.len());
 
-        for (i, &elt) in enumerate(&insert) {
+        for (i, &elt) in insert.iter().enumerate() {
             assert_eq!(set.len(), i);
             let (index, success) = set.insert_full(elt);
             assert!(success);
@@ -1501,7 +1500,7 @@ mod tests {
         let not_present = [1, 3, 6, 9, 10];
         let mut set = IndexSet::with_capacity(replace.len());
 
-        for (i, &elt) in enumerate(&replace) {
+        for (i, &elt) in replace.iter().enumerate() {
             assert_eq!(set.len(), i);
             set.replace(elt);
             assert_eq!(set.len(), i + 1);
@@ -1520,7 +1519,7 @@ mod tests {
         let present = vec![1, 6, 2];
         let mut set = IndexSet::with_capacity(replace.len());
 
-        for (i, &elt) in enumerate(&replace) {
+        for (i, &elt) in replace.iter().enumerate() {
             assert_eq!(set.len(), i);
             let (index, replaced) = set.replace_full(elt);
             assert!(replaced.is_none());
@@ -1607,7 +1606,7 @@ mod tests {
         let not_present = [1, 3, 6, 9, 10];
         let mut set = IndexSet::with_capacity(insert.len());
 
-        for (i, &elt) in enumerate(&insert) {
+        for (i, &elt) in insert.iter().enumerate() {
             assert_eq!(set.len(), i);
             set.insert(elt);
             assert_eq!(set.len(), i + 1);
diff --git a/src/util.rs b/src/util.rs
index 5388f47..a24dfaf 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -1,17 +1,9 @@
-use core::iter::Enumerate;
 use core::ops::{Bound, Range, RangeBounds};
 
 pub(crate) fn third<A, B, C>(t: (A, B, C)) -> C {
     t.2
 }
 
-pub(crate) fn enumerate<I>(iterable: I) -> Enumerate<I::IntoIter>
-where
-    I: IntoIterator,
-{
-    iterable.into_iter().enumerate()
-}
-
 pub(crate) fn simplify_range<R>(range: R, len: usize) -> Range<usize>
 where
     R: RangeBounds<usize>,