From 585d0b84672b0309e2bc0487e9c43d9df29212d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois?= Date: Sun, 26 Dec 2021 05:39:46 +0000 Subject: [PATCH] remove some `mut` in queries (#3437) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit # Objective - While reading code, found some queries that are `mut` and not used as such ## Solution - Remove `mut` when possible Co-authored-by: François <8672791+mockersf@users.noreply.github.com> --- crates/bevy_ecs/src/system/query.rs | 2 +- crates/bevy_pbr/src/render/mesh.rs | 4 ++-- crates/bevy_sprite/src/render/mod.rs | 4 ++-- crates/bevy_text/src/text2d.rs | 4 ++-- crates/bevy_ui/src/render/mod.rs | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/crates/bevy_ecs/src/system/query.rs b/crates/bevy_ecs/src/system/query.rs index ea58bb5e14..7760625833 100644 --- a/crates/bevy_ecs/src/system/query.rs +++ b/crates/bevy_ecs/src/system/query.rs @@ -211,7 +211,7 @@ use thiserror::Error; /// # struct ComponentA; /// # #[derive(Component)] /// # struct ComponentB; -/// fn immutable_query_system(mut query: Query<(&ComponentA, &ComponentB)>) { +/// fn immutable_query_system(query: Query<(&ComponentA, &ComponentB)>) { /// for (a, b) in query.iter() { /// // Here, `a` and `b` are normal references to components, relatively of /// // `&ComponentA` and `&ComponentB` types. diff --git a/crates/bevy_pbr/src/render/mesh.rs b/crates/bevy_pbr/src/render/mesh.rs index 92fd42b190..fdd3b9c585 100644 --- a/crates/bevy_pbr/src/render/mesh.rs +++ b/crates/bevy_pbr/src/render/mesh.rs @@ -584,14 +584,14 @@ pub fn queue_mesh_view_bind_groups( light_meta: Res, global_light_meta: Res, view_uniforms: Res, - mut views: Query<(Entity, &ViewShadowBindings, &ViewClusterBindings)>, + views: Query<(Entity, &ViewShadowBindings, &ViewClusterBindings)>, ) { if let (Some(view_binding), Some(light_binding), Some(point_light_binding)) = ( view_uniforms.uniforms.binding(), light_meta.view_gpu_lights.binding(), global_light_meta.gpu_point_lights.binding(), ) { - for (entity, view_shadow_bindings, view_cluster_bindings) in views.iter_mut() { + for (entity, view_shadow_bindings, view_cluster_bindings) in views.iter() { let view_bind_group = render_device.create_bind_group(&BindGroupDescriptor { entries: &[ BindGroupEntry { diff --git a/crates/bevy_sprite/src/render/mod.rs b/crates/bevy_sprite/src/render/mod.rs index f66101f44f..3e5477f4b9 100644 --- a/crates/bevy_sprite/src/render/mod.rs +++ b/crates/bevy_sprite/src/render/mod.rs @@ -480,7 +480,7 @@ pub fn queue_sprites( mut pipeline_cache: ResMut, mut image_bind_groups: ResMut, gpu_images: Res>, - mut sprite_batches: Query<(Entity, &SpriteBatch)>, + sprite_batches: Query<(Entity, &SpriteBatch)>, mut views: Query<&mut RenderPhase>, events: Res, ) { @@ -514,7 +514,7 @@ pub fn queue_sprites( SpritePipelineKey { colored: true }, ); for mut transparent_phase in views.iter_mut() { - for (entity, batch) in sprite_batches.iter_mut() { + for (entity, batch) in sprite_batches.iter() { image_bind_groups .values .entry(batch.handle.clone_weak()) diff --git a/crates/bevy_text/src/text2d.rs b/crates/bevy_text/src/text2d.rs index f8cf94be44..d4a59cd6c0 100644 --- a/crates/bevy_text/src/text2d.rs +++ b/crates/bevy_text/src/text2d.rs @@ -44,7 +44,7 @@ pub fn extract_text2d_sprite( texture_atlases: Res>, text_pipeline: Res, windows: Res, - mut text2d_query: Query<(Entity, &Text, &GlobalTransform, &Text2dSize)>, + text2d_query: Query<(Entity, &Text, &GlobalTransform, &Text2dSize)>, ) { let mut extracted_sprites = render_world.get_resource_mut::().unwrap(); let scale_factor = if let Some(window) = windows.get_primary() { @@ -53,7 +53,7 @@ pub fn extract_text2d_sprite( 1. }; - for (entity, text, transform, calculated_size) in text2d_query.iter_mut() { + for (entity, text, transform, calculated_size) in text2d_query.iter() { let (width, height) = (calculated_size.size.width, calculated_size.size.height); if let Some(text_layout) = text_pipeline.get_glyphs(&entity) { diff --git a/crates/bevy_ui/src/render/mod.rs b/crates/bevy_ui/src/render/mod.rs index 46fe825a12..e063cd4504 100644 --- a/crates/bevy_ui/src/render/mod.rs +++ b/crates/bevy_ui/src/render/mod.rs @@ -416,7 +416,7 @@ pub fn queue_uinodes( mut pipeline_cache: ResMut, mut image_bind_groups: ResMut, gpu_images: Res>, - mut ui_batches: Query<(Entity, &UiBatch)>, + ui_batches: Query<(Entity, &UiBatch)>, mut views: Query<&mut RenderPhase>, events: Res, ) { @@ -441,7 +441,7 @@ pub fn queue_uinodes( let draw_ui_function = draw_functions.read().get_id::().unwrap(); let pipeline = pipelines.specialize(&mut pipeline_cache, &ui_pipeline, UiPipelineKey {}); for mut transparent_phase in views.iter_mut() { - for (entity, batch) in ui_batches.iter_mut() { + for (entity, batch) in ui_batches.iter() { image_bind_groups .values .entry(batch.image.clone_weak())