Use enumerate() where apt

solana-labs · Nov 23, 2018 · 38ce50c · 38ce50c
1 parent 9a9e76c
commit 38ce50c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/db_ledger.rs b/src/db_ledger.rs
@@ -294,7 +294,7 @@ impl DbLedger {
         I: IntoIterator<Item = &'a Entry>,
     {
         let default_addr = SocketAddr::new(IpAddr::V4(Ipv4Addr::new(0, 0, 0, 0)), 0);
-        let shared_blobs = entries.into_iter().zip(0..).map(|(entry, idx)| {
+        let shared_blobs = entries.into_iter().enumerate().map(|(entry, idx)| {
             entry.to_blob(Some(idx), Some(Pubkey::default()), Some(&default_addr))
         });
         self.write_shared_blobs(slot, shared_blobs)
@@ -661,7 +661,7 @@ mod tests {
             let num_entries = 8;
             let shared_blobs = make_tiny_test_entries(num_entries).to_blobs();
 
-            for (b, i) in shared_blobs.iter().zip(0..num_entries) {
+            for (b, i) in shared_blobs.iter().enumerate() {
                 b.write().unwrap().set_index(1 << (i * 8)).unwrap();
             }
 

diff --git a/src/db_window.rs b/src/db_window.rs
@@ -531,7 +531,7 @@ mod test {
         assert!(gap > 3);
         let num_entries = 10;
         let shared_blobs = make_tiny_test_entries(num_entries).to_blobs();
-        for (b, i) in shared_blobs.iter().zip(0..shared_blobs.len() as u64) {
+        for (b, i) in shared_blobs.iter().enumerate() {
             b.write().unwrap().set_index(i * gap).unwrap();
         }
         let blob_locks: Vec<_> = shared_blobs.iter().map(|b| b.read().unwrap()).collect();