diff --git a/world/src/column/mod.rs b/world/src/column/mod.rs index 0b9f687bea..1f4e68aaf6 100644 --- a/world/src/column/mod.rs +++ b/world/src/column/mod.rs @@ -110,7 +110,7 @@ impl<'a> ColumnGen<'a> { .gen_ctx .structure_gen .get(wpos) - .into_iter() + .iter() .copied() .enumerate() .for_each(|(i, (pos, seed))| { @@ -180,7 +180,7 @@ fn quadratic_nearest_point( let roots = roots.as_ref(); let min_root = roots - .into_iter() + .iter() .copied() .filter_map(|root| { let river_point = spline.x * root * root + spline.y * root + spline.z; diff --git a/world/src/sim/erosion.rs b/world/src/sim/erosion.rs index 06420b722a..4845033236 100644 --- a/world/src/sim/erosion.rs +++ b/world/src/sim/erosion.rs @@ -1004,7 +1004,7 @@ pub fn get_lakes(h: &[f32], downhill: &mut [isize]) -> (usize, Box<[i32]>, Box<[ // longer negates its maximum number of passes, but the lake side of the chosen pass. As such, // we should make sure not to rely on using it this way afterwards. // provides information about the number of candidate passes in a lake. - 'outer_final_pass: while let Some(Reverse((_, (chunk_idx, neighbor_idx)))) = candidates.pop() { + while let Some(Reverse((_, (chunk_idx, neighbor_idx)))) = candidates.pop() { // We have the smallest candidate. let lake_idx = indirection_[chunk_idx as usize] as usize; let indirection_idx = indirection[chunk_idx as usize]; diff --git a/world/src/sim/util.rs b/world/src/sim/util.rs index d64f8a8e90..252dc68050 100644 --- a/world/src/sim/util.rs +++ b/world/src/sim/util.rs @@ -229,7 +229,7 @@ pub fn neighbors(posi: usize) -> impl Clone + Iterator { (0, 1), (1, 1), ] - .into_iter() + .iter() .map(move |&(x, y)| Vec2::new(pos.x + x, pos.y + y)) .filter(|pos| { pos.x >= 0 && pos.y >= 0 && pos.x < WORLD_SIZE.x as i32 && pos.y < WORLD_SIZE.y as i32