From 67639e2f11ac08c5aa5b6c3596f2ac494cbfef57 Mon Sep 17 00:00:00 2001
From: Cecylia Bocovich <cohosh@torproject.org>
Date: Fri, 16 Jun 2023 12:27:40 -0400
Subject: [PATCH] Remove needless range loops

---
 crates/lox-distributor/src/lox_context.rs | 7 ++++---
 crates/lox-library/src/lib.rs             | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/crates/lox-distributor/src/lox_context.rs b/crates/lox-distributor/src/lox_context.rs
index 4f8920a..d99cc62 100644
--- a/crates/lox-distributor/src/lox_context.rs
+++ b/crates/lox-distributor/src/lox_context.rs
@@ -29,10 +29,11 @@ impl LoxServerContext {
     pub fn remove_extra_bridges(&self) -> [BridgeLine; MAX_BRIDGES_PER_BUCKET] {
         let mut extra_bridges = self.extra_bridges.lock().unwrap();
         let mut return_bridges = [BridgeLine::default(); MAX_BRIDGES_PER_BUCKET];
-        for i in 0..MAX_BRIDGES_PER_BUCKET {
-            return_bridges[i] = extra_bridges.remove(i);
+        for bridge in return_bridges.iter_mut() {
+            if let Some(extra) = extra_bridges.pop() {
+                *bridge = extra
+            }
         }
-
         return_bridges
     }
 
diff --git a/crates/lox-library/src/lib.rs b/crates/lox-library/src/lib.rs
index 1c56bb8..3a622bc 100644
--- a/crates/lox-library/src/lib.rs
+++ b/crates/lox-library/src/lib.rs
@@ -344,8 +344,8 @@ impl BridgeAuth {
         }
         while self.bridge_table.unallocated_bridges.len() >= MAX_BRIDGES_PER_BUCKET {
             let mut bucket = [BridgeLine::default(); MAX_BRIDGES_PER_BUCKET];
-            for i in 0..MAX_BRIDGES_PER_BUCKET {
-                bucket[i] = self.bridge_table.unallocated_bridges.pop().unwrap();
+            for bridge in bucket.iter_mut() {
+                *bridge = self.bridge_table.unallocated_bridges.pop().unwrap();
             }
             self.add_openinv_bridges(bucket, bdb);
         }