From ad6004698232b75e505955fce037d51e8826da53 Mon Sep 17 00:00:00 2001 From: Jakob Hellermann Date: Thu, 25 Mar 2021 20:48:18 +0000 Subject: [PATCH] fix clippy lints (#1756) --- crates/bevy_app/src/event.rs | 2 +- crates/bevy_asset/src/loader.rs | 7 +++---- crates/bevy_ecs/macros/src/lib.rs | 3 +-- crates/bevy_reflect/src/struct_trait.rs | 8 +++----- .../src/pipeline/pipeline_compiler.rs | 12 +++++------- .../nodes/render_resources_node.rs | 18 ++++++------------ crates/bevy_render/src/shader/shader.rs | 2 +- crates/bevy_render/src/texture/texture.rs | 2 +- .../src/components/global_transform.rs | 4 ++-- .../bevy_transform/src/components/transform.rs | 4 ++-- .../renderer/wgpu_render_resource_context.rs | 18 ++++++++++-------- 11 files changed, 35 insertions(+), 45 deletions(-) diff --git a/crates/bevy_app/src/event.rs b/crates/bevy_app/src/event.rs index 63e8cfcfba..d123b27d28 100644 --- a/crates/bevy_app/src/event.rs +++ b/crates/bevy_app/src/event.rs @@ -276,7 +276,7 @@ impl Events { }; trace!("Events::send() -> {}", event_id); - let event_instance = EventInstance { event, event_id }; + let event_instance = EventInstance { event_id, event }; match self.state { State::A => self.events_a.push(event_instance), diff --git a/crates/bevy_asset/src/loader.rs b/crates/bevy_asset/src/loader.rs index 5344d13e1e..aa0f3cd009 100644 --- a/crates/bevy_asset/src/loader.rs +++ b/crates/bevy_asset/src/loader.rs @@ -64,10 +64,9 @@ pub(crate) struct BoxedLoadedAsset { impl From> for BoxedLoadedAsset { fn from(asset: LoadedAsset) -> Self { BoxedLoadedAsset { - value: match asset.value { - Some(value) => Some(Box::new(value)), - None => None, - }, + value: asset + .value + .map(|value| Box::new(value) as Box), dependencies: asset.dependencies, } } diff --git a/crates/bevy_ecs/macros/src/lib.rs b/crates/bevy_ecs/macros/src/lib.rs index 07108b59de..4323355202 100644 --- a/crates/bevy_ecs/macros/src/lib.rs +++ b/crates/bevy_ecs/macros/src/lib.rs @@ -28,8 +28,7 @@ impl Parse for AllTuples { input.parse::()?; let end = input.parse::()?.base10_parse()?; input.parse::()?; - let mut idents = Vec::new(); - idents.push(input.parse::()?); + let mut idents = vec![input.parse::()?]; while input.parse::().is_ok() { idents.push(input.parse::()?); } diff --git a/crates/bevy_reflect/src/struct_trait.rs b/crates/bevy_reflect/src/struct_trait.rs index de056d85df..756cbdbcd3 100644 --- a/crates/bevy_reflect/src/struct_trait.rs +++ b/crates/bevy_reflect/src/struct_trait.rs @@ -109,11 +109,9 @@ impl DynamicStruct { impl Struct for DynamicStruct { #[inline] fn field(&self, name: &str) -> Option<&dyn Reflect> { - if let Some(index) = self.field_indices.get(name) { - Some(&*self.fields[*index]) - } else { - None - } + self.field_indices + .get(name) + .map(|index| &*self.fields[*index]) } #[inline] diff --git a/crates/bevy_render/src/pipeline/pipeline_compiler.rs b/crates/bevy_render/src/pipeline/pipeline_compiler.rs index 320a2dde7f..b09d7ce8f2 100644 --- a/crates/bevy_render/src/pipeline/pipeline_compiler.rs +++ b/crates/bevy_render/src/pipeline/pipeline_compiler.rs @@ -284,15 +284,13 @@ impl PipelineCompiler { &self, pipeline_handle: Handle, ) -> Option>> { - if let Some(compiled_pipelines) = self.specialized_pipelines.get(&pipeline_handle) { - Some( + self.specialized_pipelines + .get(&pipeline_handle) + .map(|compiled_pipelines| { compiled_pipelines .iter() - .map(|specialized_pipeline| &specialized_pipeline.pipeline), - ) - } else { - None - } + .map(|specialized_pipeline| &specialized_pipeline.pipeline) + }) } pub fn iter_all_compiled_pipelines(&self) -> impl Iterator> { diff --git a/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs b/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs index 23756aead2..efbb8ca1f8 100644 --- a/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs +++ b/crates/bevy_render/src/render_graph/nodes/render_resources_node.rs @@ -202,10 +202,8 @@ where render_resource_context: &dyn RenderResourceContext, ) -> bool { let mut resized = false; - for buffer_array in self.buffer_arrays.iter_mut() { - if let Some(buffer_array) = buffer_array { - resized |= buffer_array.resize(render_resource_context); - } + for buffer_array in self.buffer_arrays.iter_mut().flatten() { + resized |= buffer_array.resize(render_resource_context); } resized @@ -213,10 +211,8 @@ where fn set_required_staging_buffer_size_to_max(&mut self) { let mut new_size = 0; - for buffer_array in self.buffer_arrays.iter() { - if let Some(buffer_array) = buffer_array { - new_size += buffer_array.item_size * buffer_array.len; - } + for buffer_array in self.buffer_arrays.iter().flatten() { + new_size += buffer_array.item_size * buffer_array.len; } if new_size > self.required_staging_buffer_size { @@ -248,10 +244,8 @@ where } fn remove_bindings(&mut self, id: I) { - for buffer_array in self.buffer_arrays.iter_mut() { - if let Some(buffer_array) = buffer_array { - buffer_array.remove_binding(id); - } + for buffer_array in self.buffer_arrays.iter_mut().flatten() { + buffer_array.remove_binding(id); } } diff --git a/crates/bevy_render/src/shader/shader.rs b/crates/bevy_render/src/shader/shader.rs index dc10ccff95..66376c11c6 100644 --- a/crates/bevy_render/src/shader/shader.rs +++ b/crates/bevy_render/src/shader/shader.rs @@ -142,7 +142,7 @@ pub struct Shader { impl Shader { pub fn new(stage: ShaderStage, source: ShaderSource) -> Shader { - Shader { stage, source } + Shader { source, stage } } #[cfg(not(target_arch = "wasm32"))] diff --git a/crates/bevy_render/src/texture/texture.rs b/crates/bevy_render/src/texture/texture.rs index 54f1e4a380..ecaad4f7db 100644 --- a/crates/bevy_render/src/texture/texture.rs +++ b/crates/bevy_render/src/texture/texture.rs @@ -56,8 +56,8 @@ impl Texture { Self { data, size, - dimension, format, + dimension, ..Default::default() } } diff --git a/crates/bevy_transform/src/components/global_transform.rs b/crates/bevy_transform/src/components/global_transform.rs index 96e050b2af..7c77162bc1 100644 --- a/crates/bevy_transform/src/components/global_transform.rs +++ b/crates/bevy_transform/src/components/global_transform.rs @@ -144,9 +144,9 @@ impl GlobalTransform { let rotation = self.rotation * transform.rotation; let scale = self.scale * transform.scale; GlobalTransform { - scale, - rotation, translation, + rotation, + scale, } } diff --git a/crates/bevy_transform/src/components/transform.rs b/crates/bevy_transform/src/components/transform.rs index 878ef33ca8..085e5d702c 100644 --- a/crates/bevy_transform/src/components/transform.rs +++ b/crates/bevy_transform/src/components/transform.rs @@ -156,9 +156,9 @@ impl Transform { let rotation = self.rotation * transform.rotation; let scale = self.scale * transform.scale; Transform { - scale, - rotation, translation, + rotation, + scale, } } diff --git a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs index e7c5b79936..d4bd06f313 100644 --- a/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs +++ b/crates/bevy_wgpu/src/renderer/wgpu_render_resource_context.rs @@ -476,10 +476,11 @@ impl RenderResourceContext for WgpuRenderResourceContext { .get(&pipeline_descriptor.shader_stages.vertex) .unwrap(); - let fragment_shader_module = match pipeline_descriptor.shader_stages.fragment { - Some(ref fragment_handle) => Some(shader_modules.get(fragment_handle).unwrap()), - None => None, - }; + let fragment_shader_module = pipeline_descriptor + .shader_stages + .fragment + .as_ref() + .map(|fragment_handle| shader_modules.get(fragment_handle).unwrap()); let render_pipeline_descriptor = wgpu::RenderPipelineDescriptor { label: None, layout: Some(&pipeline_layout), @@ -491,14 +492,15 @@ impl RenderResourceContext for WgpuRenderResourceContext { .map(|v| v.into()) .collect::>(), }, - fragment: match pipeline_descriptor.shader_stages.fragment { - Some(_) => Some(wgpu::FragmentState { + fragment: pipeline_descriptor + .shader_stages + .fragment + .as_ref() + .map(|_| wgpu::FragmentState { entry_point: "main", module: fragment_shader_module.as_ref().unwrap(), targets: color_states.as_slice(), }), - None => None, - }, primitive: pipeline_descriptor.primitive.clone().wgpu_into(), depth_stencil: pipeline_descriptor .depth_stencil