From fb67de908ec0bd2e54b4c8a4f1b8372f0d0d2d84 Mon Sep 17 00:00:00 2001 From: Erich Gubler Date: Mon, 7 Nov 2022 10:27:46 -0500 Subject: [PATCH] refactor: resolve `clippy::explicit_auto_deref` --- wgpu-core/src/hub.rs | 12 ++++++------ wgpu-hal/src/dx12/device.rs | 4 ++-- wgpu-hal/src/metal/surface.rs | 2 +- wgpu-hal/src/vulkan/device.rs | 2 +- wgpu/examples/mipmap/main.rs | 4 ++-- wgpu/tests/shader/mod.rs | 2 +- wgpu/tests/shader_primitive_index/mod.rs | 2 +- wgpu/tests/vertex_indices/mod.rs | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/wgpu-core/src/hub.rs b/wgpu-core/src/hub.rs index 38918b8cbe..f07010477c 100644 --- a/wgpu-core/src/hub.rs +++ b/wgpu-core/src/hub.rs @@ -1156,7 +1156,7 @@ impl Global { let mut surface_guard = self.surfaces.data.write(); let hub = A::hub(self); // this is used for tests, which keep the adapter - hub.clear(&mut *surface_guard, false); + hub.clear(&mut surface_guard, false); } pub fn generate_report(&self) -> GlobalReport { @@ -1205,23 +1205,23 @@ impl Drop for Global { // destroy hubs before the instance gets dropped #[cfg(vulkan)] { - self.hubs.vulkan.clear(&mut *surface_guard, true); + self.hubs.vulkan.clear(&mut surface_guard, true); } #[cfg(metal)] { - self.hubs.metal.clear(&mut *surface_guard, true); + self.hubs.metal.clear(&mut surface_guard, true); } #[cfg(dx12)] { - self.hubs.dx12.clear(&mut *surface_guard, true); + self.hubs.dx12.clear(&mut surface_guard, true); } #[cfg(dx11)] { - self.hubs.dx11.clear(&mut *surface_guard, true); + self.hubs.dx11.clear(&mut surface_guard, true); } #[cfg(gl)] { - self.hubs.gl.clear(&mut *surface_guard, true); + self.hubs.gl.clear(&mut surface_guard, true); } // destroy surfaces diff --git a/wgpu-hal/src/dx12/device.rs b/wgpu-hal/src/dx12/device.rs index 94a87dd466..3809470ebe 100644 --- a/wgpu-hal/src/dx12/device.rs +++ b/wgpu-hal/src/dx12/device.rs @@ -1231,7 +1231,7 @@ impl crate::Device for super::Device { Some(inner) => { let dual = descriptor::upload( self.raw, - &*inner, + &inner, &self.shared.heap_views, &desc.layout.copy_counts, )?; @@ -1243,7 +1243,7 @@ impl crate::Device for super::Device { Some(inner) => { let dual = descriptor::upload( self.raw, - &*inner, + &inner, &self.shared.heap_samplers, &desc.layout.copy_counts, )?; diff --git a/wgpu-hal/src/metal/surface.rs b/wgpu-hal/src/metal/surface.rs index 1e0f1070b8..6206453ad1 100644 --- a/wgpu-hal/src/metal/surface.rs +++ b/wgpu-hal/src/metal/surface.rs @@ -207,7 +207,7 @@ impl crate::Surface for super::Surface { let () = msg_send![*render_layer, setFrame: bounds]; } } - render_layer.set_device(&*device_raw); + render_layer.set_device(&device_raw); render_layer.set_pixel_format(self.raw_swapchain_format); render_layer.set_framebuffer_only(framebuffer_only); render_layer.set_presents_with_transaction(self.present_with_transaction); diff --git a/wgpu-hal/src/vulkan/device.rs b/wgpu-hal/src/vulkan/device.rs index 65d5c70e24..f30cd57dc4 100644 --- a/wgpu-hal/src/vulkan/device.rs +++ b/wgpu-hal/src/vulkan/device.rs @@ -1445,7 +1445,7 @@ impl crate::Device for super::Device { crate::ShaderInput::SpirV(spv) => Cow::Borrowed(spv), }; - let raw = self.create_shader_module_impl(&*spv)?; + let raw = self.create_shader_module_impl(&spv)?; if let Some(label) = desc.label { self.shared diff --git a/wgpu/examples/mipmap/main.rs b/wgpu/examples/mipmap/main.rs index 70ecbd91a0..5e62e35c06 100644 --- a/wgpu/examples/mipmap/main.rs +++ b/wgpu/examples/mipmap/main.rs @@ -400,9 +400,9 @@ impl framework::Example for Example { .slice(pipeline_statistics_offset()..) .get_mapped_range(); // Convert the raw data into a useful structure - let timestamp_data: &TimestampQueries = bytemuck::from_bytes(&*timestamp_view); + let timestamp_data: &TimestampQueries = bytemuck::from_bytes(×tamp_view); let pipeline_stats_data: &PipelineStatisticsQueries = - bytemuck::from_bytes(&*pipeline_stats_view); + bytemuck::from_bytes(&pipeline_stats_view); // Iterate over the data for (idx, (timestamp, pipeline)) in timestamp_data .iter() diff --git a/wgpu/tests/shader/mod.rs b/wgpu/tests/shader/mod.rs index cec5f9f33b..c1cca4e4d7 100644 --- a/wgpu/tests/shader/mod.rs +++ b/wgpu/tests/shader/mod.rs @@ -347,7 +347,7 @@ fn shader_input_output_test( let mapped = mapping_buffer.slice(..).get_mapped_range(); - let typed: &[u32] = bytemuck::cast_slice(&*mapped); + let typed: &[u32] = bytemuck::cast_slice(&mapped); // -- Check results -- diff --git a/wgpu/tests/shader_primitive_index/mod.rs b/wgpu/tests/shader_primitive_index/mod.rs index 41902f7225..5e6c6b1b70 100644 --- a/wgpu/tests/shader_primitive_index/mod.rs +++ b/wgpu/tests/shader_primitive_index/mod.rs @@ -237,7 +237,7 @@ fn capture_rgba_u8_texture( let slice = output_buffer.slice(..); slice.map_async(wgpu::MapMode::Read, |_| ()); ctx.device.poll(wgpu::Maintain::Wait); - let data: Vec = bytemuck::cast_slice(&*slice.get_mapped_range()).to_vec(); + let data: Vec = bytemuck::cast_slice(&slice.get_mapped_range()).to_vec(); // Chunk rows from output buffer, take actual pixel // bytes from each row and flatten into a vector. data.chunks_exact(bytes_per_row as usize) diff --git a/wgpu/tests/vertex_indices/mod.rs b/wgpu/tests/vertex_indices/mod.rs index d76b436784..177b857448 100644 --- a/wgpu/tests/vertex_indices/mod.rs +++ b/wgpu/tests/vertex_indices/mod.rs @@ -125,7 +125,7 @@ fn pulling_common( let slice = buffer.slice(..); slice.map_async(wgpu::MapMode::Read, |_| ()); ctx.device.poll(wgpu::Maintain::Wait); - let data: Vec = bytemuck::cast_slice(&*slice.get_mapped_range()).to_vec(); + let data: Vec = bytemuck::cast_slice(&slice.get_mapped_range()).to_vec(); assert_eq!(data, expected); }