Skip to content

Commit 7dae8eb

Browse files
committed
Remove crate::util::enumerate
1 parent ca49d7d commit 7dae8eb

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

src/map.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1495,7 +1495,6 @@ where
14951495
#[cfg(test)]
14961496
mod tests {
14971497
use super::*;
1498-
use crate::util::enumerate;
14991498
use std::string::String;
15001499

15011500
#[test]
@@ -1524,7 +1523,7 @@ mod tests {
15241523
let not_present = [1, 3, 6, 9, 10];
15251524
let mut map = IndexMap::with_capacity(insert.len());
15261525

1527-
for (i, &elt) in enumerate(&insert) {
1526+
for (i, &elt) in insert.iter().enumerate() {
15281527
assert_eq!(map.len(), i);
15291528
map.insert(elt, elt);
15301529
assert_eq!(map.len(), i + 1);
@@ -1544,7 +1543,7 @@ mod tests {
15441543
let present = vec![1, 6, 2];
15451544
let mut map = IndexMap::with_capacity(insert.len());
15461545

1547-
for (i, &elt) in enumerate(&insert) {
1546+
for (i, &elt) in insert.iter().enumerate() {
15481547
assert_eq!(map.len(), i);
15491548
let (index, existing) = map.insert_full(elt, elt);
15501549
assert_eq!(existing, None);
@@ -1611,7 +1610,7 @@ mod tests {
16111610
let not_present = [1, 3, 6, 9, 10];
16121611
let mut map = IndexMap::with_capacity(insert.len());
16131612

1614-
for (i, &elt) in enumerate(&insert) {
1613+
for (i, &elt) in insert.iter().enumerate() {
16151614
assert_eq!(map.len(), i);
16161615
map.insert(elt, elt);
16171616
assert_eq!(map.len(), i + 1);

src/set.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1355,7 +1355,6 @@ where
13551355
#[cfg(test)]
13561356
mod tests {
13571357
use super::*;
1358-
use crate::util::enumerate;
13591358
use std::string::String;
13601359

13611360
#[test]
@@ -1384,7 +1383,7 @@ mod tests {
13841383
let not_present = [1, 3, 6, 9, 10];
13851384
let mut set = IndexSet::with_capacity(insert.len());
13861385

1387-
for (i, &elt) in enumerate(&insert) {
1386+
for (i, &elt) in insert.iter().enumerate() {
13881387
assert_eq!(set.len(), i);
13891388
set.insert(elt);
13901389
assert_eq!(set.len(), i + 1);
@@ -1403,7 +1402,7 @@ mod tests {
14031402
let present = vec![1, 6, 2];
14041403
let mut set = IndexSet::with_capacity(insert.len());
14051404

1406-
for (i, &elt) in enumerate(&insert) {
1405+
for (i, &elt) in insert.iter().enumerate() {
14071406
assert_eq!(set.len(), i);
14081407
let (index, success) = set.insert_full(elt);
14091408
assert!(success);
@@ -1490,7 +1489,7 @@ mod tests {
14901489
let not_present = [1, 3, 6, 9, 10];
14911490
let mut set = IndexSet::with_capacity(insert.len());
14921491

1493-
for (i, &elt) in enumerate(&insert) {
1492+
for (i, &elt) in insert.iter().enumerate() {
14941493
assert_eq!(set.len(), i);
14951494
set.insert(elt);
14961495
assert_eq!(set.len(), i + 1);

src/util.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,9 @@
1-
use core::iter::Enumerate;
21
use core::ops::{Bound, Range, RangeBounds};
32

43
pub(crate) fn third<A, B, C>(t: (A, B, C)) -> C {
54
t.2
65
}
76

8-
pub(crate) fn enumerate<I>(iterable: I) -> Enumerate<I::IntoIter>
9-
where
10-
I: IntoIterator,
11-
{
12-
iterable.into_iter().enumerate()
13-
}
14-
157
pub(crate) fn simplify_range<R>(range: R, len: usize) -> Range<usize>
168
where
179
R: RangeBounds<usize>,

0 commit comments

Comments
 (0)