From a85c295391c6c34c9899d1cbd01645d2c56bc4a2 Mon Sep 17 00:00:00 2001 From: Jim Schreckengast Date: Sat, 14 Nov 2026 22:44:13 -0700 Subject: [PATCH] Iterate over slices in three loops so Clippy passes on Rust 1.100 CI installs the newest stable Rust on every run. Since it moved to Rust 1.100.0, the required Clippy check fails on every pull request, whatever the pull request changes: Clippy now reports needless_range_loop on main for three loops that index a slice with the loop variable of a range. Two go through the movements, in RlController::shield and RlController::features, and one goes through the rest of a vehicle's route, in Sim::leader. The loops now iterate over the slices instead. Behavior does not change, because each loop visits the same elements in the same order: SensorView::new gives the view one entry per movement, and leader has already read route[ri], so the rest of the route is a valid slice. Signed-off-by: Jim Schreckengast --- src/control/rl.rs | 6 ++---- src/sim/mod.rs | 3 +-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/control/rl.rs b/src/control/rl.rs index 2f68a27..6440606 100644 --- a/src/control/rl.rs +++ b/src/control/rl.rs @@ -179,9 +179,8 @@ impl RlController { let demand: Vec = (0..net.stages.len()) .map(|j| { let mut d = 0.0; - for m in 0..net.movements.len() { + for (m, mo) in ctx.view.moves.iter().enumerate().take(net.movements.len()) { if stat(net, j, m).is_some() { - let mo = &ctx.view.moves[m]; d += mo.queue + mo.vehicles .iter() @@ -206,8 +205,7 @@ impl RlController { let net = ctx.net; let mut f = Vec::with_capacity(n_inputs(net)); let cur = ctx.sig.stage; - for m in 0..net.movements.len() { - let mo = &ctx.view.moves[m]; + for (m, mo) in ctx.view.moves.iter().enumerate().take(net.movements.len()) { let mut n10 = 0.0; let mut n30 = 0.0; for o in &mo.vehicles { diff --git a/src/sim/mod.rs b/src/sim/mod.rs index 396055b..f9f7e8c 100644 --- a/src/sim/mod.rs +++ b/src/sim/mod.rs @@ -1341,8 +1341,7 @@ impl Sim { } let mut dist = self.net.links[link].length() - v.s; let mut prev = link; - for k in v.ri + 1..v.route.len() { - let next = v.route[k]; + for &next in &v.route[v.ri + 1..] { for &j in &self.occ[next] { let w = &self.vehicles[j]; consider(&mut best, dist + w.s - w.len(), w.v, j);