fixup! fixup! chore: naively set warn(unsafe_op_in_unsafe_fn) in wgpu-hal

Author: ErichDonGubler

wgpu-hal/src/vulkan/command.rs

@@ -488,28 +488,26 @@ impl crate::CommandEncoder<super::Api> for super::CommandEncoder {
         unsafe {
             self.device
                 .raw
-                .cmd_set_viewport(self.active, 0, &vk_viewports)
-        };
-        unsafe {
+                .cmd_set_viewport(self.active, 0, &vk_viewports);
             self.device
                 .raw
-                .cmd_set_scissor(self.active, 0, &[render_area])
-        };
-        unsafe {
+                .cmd_set_scissor(self.active, 0, &[render_area]);
             self.device.raw.cmd_begin_render_pass(
                 self.active,
                 &vk_info,
                 vk::SubpassContents::INLINE,
-            )
+            );
         };
 
         self.bind_point = vk::PipelineBindPoint::GRAPHICS;
     }
     unsafe fn end_render_pass(&mut self) {
-        unsafe { self.device.raw.cmd_end_render_pass(self.active) };
-        if self.rpass_debug_marker_active {
-            unsafe { self.end_debug_marker() };
-            self.rpass_debug_marker_active = false;
+        unsafe {
+            self.device.raw.cmd_end_render_pass(self.active);
+            if self.rpass_debug_marker_active {
+                self.end_debug_marker();
+                self.rpass_debug_marker_active = false;
+            }
         }
     }
 

wgpu-hal/src/vulkan/device.rs

@@ -1101,21 +1101,19 @@ impl crate::Device<super::Api> for super::Device {
         })
     }
     unsafe fn destroy_command_encoder(&self, cmd_encoder: super::CommandEncoder) {
-        if !cmd_encoder.free.is_empty() {
-            unsafe {
+        unsafe {
+            if !cmd_encoder.free.is_empty() {
                 self.shared
                     .raw
                     .free_command_buffers(cmd_encoder.raw, &cmd_encoder.free)
-            };
-        }
-        if !cmd_encoder.discarded.is_empty() {
-            unsafe {
+            }
+            if !cmd_encoder.discarded.is_empty() {
                 self.shared
                     .raw
                     .free_command_buffers(cmd_encoder.raw, &cmd_encoder.discarded)
-            };
+            }
+            self.shared.raw.destroy_command_pool(cmd_encoder.raw, None);
         }
-        unsafe { self.shared.raw.destroy_command_pool(cmd_encoder.raw, None) };
     }
 
     unsafe fn create_bind_group_layout(