From 9939eae361d5fe7597f856c2b762f85e40e0a37c Mon Sep 17 00:00:00 2001 From: ice_iix Date: Thu, 2 Jul 2020 17:07:48 -0700 Subject: [PATCH] Use values_mut() to iterate map values (for_kv_map) --- src/render/model.rs | 2 +- src/world/mod.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/render/model.rs b/src/render/model.rs index 70a1bea..20a1879 100644 --- a/src/render/model.rs +++ b/src/render/model.rs @@ -219,7 +219,7 @@ impl Manager { textures: &Arc>, ) { for collection in &mut self.collections { - for (_, model) in &mut collection.models { + for model in collection.models.values_mut() { for vert in &mut model.verts { vert.texture = if vert.texture.version == version { vert.texture.clone() diff --git a/src/world/mod.rs b/src/world/mod.rs index c56f091..92336e3 100644 --- a/src/world/mod.rs +++ b/src/world/mod.rs @@ -313,7 +313,7 @@ impl World { pub fn copy_cloud_heightmap(&mut self, data: &mut [u8]) -> bool { let mut dirty = false; - for (_, c) in &mut self.chunks { + for c in self.chunks.values_mut() { if c.heightmap_dirty { dirty = true; c.heightmap_dirty = false; @@ -440,7 +440,7 @@ impl World { pub fn get_dirty_chunk_sections(&mut self) -> Vec<(i32, i32, i32)> { let mut out = vec![]; - for (_, chunk) in &mut self.chunks { + for chunk in self.chunks.values_mut() { for sec in &mut chunk.sections { if let Some(sec) = sec.as_mut() { if !sec.building && sec.dirty { @@ -487,7 +487,7 @@ impl World { } pub fn flag_dirty_all(&mut self) { - for (_, chunk) in &mut self.chunks { + for chunk in self.chunks.values_mut() { for sec in &mut chunk.sections { if let Some(sec) = sec.as_mut() { sec.dirty = true;