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

Author: ErichDonGubler

wgpu-core/src/track/buffer.rs

@@ -713,16 +713,19 @@ unsafe fn insert<A: hub::HalApi>(
 
     log::trace!("\tbuf {index}: insert {new_start_state:?}..{new_end_state:?}");
 
-    if let Some(&mut ref mut start_state) = start_states {
-        unsafe { *start_state.get_unchecked_mut(index) = new_start_state };
-    }
-    unsafe { *current_states.get_unchecked_mut(index) = new_end_state };
+    unsafe {
+        if let Some(&mut ref mut start_state) = start_states {
+            *start_state.get_unchecked_mut(index) = new_start_state;
+        }
+        *current_states.get_unchecked_mut(index) = new_end_state;
 
-    let (epoch, ref_count) = unsafe { metadata_provider.get_own(life_guard, index) };
+        let (epoch, ref_count) = metadata_provider.get_own(life_guard, index);
 
-    resource_metadata.owned.set(index, true);
-    unsafe { *resource_metadata.epochs.get_unchecked_mut(index) = epoch };
-    unsafe { *resource_metadata.ref_counts.get_unchecked_mut(index) = Some(ref_count) };
+        resource_metadata.owned.set(index, true);
+
+        *resource_metadata.epochs.get_unchecked_mut(index) = epoch;
+        *resource_metadata.ref_counts.get_unchecked_mut(index) = Some(ref_count);
+    }
 }
 
 #[inline(always)]

wgpu-core/src/track/mod.rs

@@ -609,11 +609,11 @@ impl<A: hub::HalApi> UsageScope<A> {
         textures: &hub::Storage<resource::Texture<A>, id::TextureId>,
         bind_group: &BindGroupStates<A>,
     ) -> Result<(), UsageConflict> {
-        unsafe { self.buffers.merge_bind_group(&bind_group.buffers)? };
         unsafe {
+            self.buffers.merge_bind_group(&bind_group.buffers)?;
             self.textures
-                .merge_bind_group(textures, &bind_group.textures)?
-        };
+                .merge_bind_group(textures, &bind_group.textures)?;
+        }
 
         Ok(())
     }