Clippy & fmt.

Author: Vecvec

tests/tests/wgpu-gpu/ray_tracing/as_build.rs

@@ -235,7 +235,6 @@ fn out_of_order_as_build_use(ctx: TestingContext) {
         None,
     );
 
-
     let as_ctx = AsBuildContext::new(
         &ctx,
         AccelerationStructureFlags::empty(),

wgpu-core/src/command/compute.rs

@@ -24,8 +24,7 @@ use crate::{
     global::Global,
     hal_label, id,
     init_tracker::{BufferInitTrackerAction, MemoryInitKind},
-    pipeline::ComputePipeline
-    ,
+    pipeline::ComputePipeline,
     resource::{
         self, Buffer, DestroyedResourceError, InvalidResourceError, Labeled,
         MissingBufferUsageError, ParentDevice,

wgpu-core/src/command/ray_tracing.rs

@@ -7,6 +7,9 @@ use core::{
 
 use wgt::{math::align_to, BufferUsages, BufferUses, Features};
 
+use crate::device::resource::CommandIndices;
+use crate::lock::RwLockWriteGuard;
+use crate::ray_tracing::{AsAction, AsBuild, TlasBuild, ValidateAsActionsError};
 use crate::{
     command::CommandBufferMutable,
     device::queue::TempResource,
@@ -15,19 +18,15 @@ use crate::{
     id::CommandEncoderId,
     init_tracker::MemoryInitKind,
     ray_tracing::{
-        BlasBuildEntry, BlasGeometries, BlasTriangleGeometry,
-        BuildAccelerationStructureError, TlasBuildEntry, TlasInstance, TlasPackage,
-        TraceBlasBuildEntry, TraceBlasGeometries, TraceBlasTriangleGeometry, TraceTlasInstance,
-        TraceTlasPackage,
+        BlasBuildEntry, BlasGeometries, BlasTriangleGeometry, BuildAccelerationStructureError,
+        TlasBuildEntry, TlasInstance, TlasPackage, TraceBlasBuildEntry, TraceBlasGeometries,
+        TraceBlasTriangleGeometry, TraceTlasInstance, TraceTlasPackage,
     },
     resource::{AccelerationStructure, Blas, Buffer, Labeled, StagingBuffer, Tlas},
     scratch::ScratchBuffer,
     snatch::SnatchGuard,
     track::PendingTransition,
 };
-use crate::device::resource::CommandIndices;
-use crate::lock::RwLockWriteGuard;
-use crate::ray_tracing::{AsAction, AsBuild, TlasBuild, ValidateAsActionsError};
 
 struct TriangleBufferStore<'a> {
     vertex_buffer: Arc<Buffer>,
@@ -744,9 +743,9 @@ impl CommandBufferMutable {
             match action {
                 AsAction::Build(build) => {
                     let build_command_index = NonZeroU64::new(
-                        command_index_guard.next_acceleration_structure_build_command_index
+                        command_index_guard.next_acceleration_structure_build_command_index,
                     )
-                        .unwrap();
+                    .unwrap();
 
                     command_index_guard.next_acceleration_structure_build_command_index += 1;
                     for blas in build.blas_s_built.iter() {
@@ -763,17 +762,19 @@ impl CommandBufferMutable {
                             }
                         }
                         *tlas_build.tlas.built_index.write() = Some(build_command_index);
-                        tlas_build.tlas.dependencies.write().clone_from(&tlas_build.dependencies)
+                        tlas_build
+                            .tlas
+                            .dependencies
+                            .write()
+                            .clone_from(&tlas_build.dependencies)
                     }
                 }
                 AsAction::UseTlas(tlas) => {
                     let tlas_build_index = tlas.built_index.read();
                     let dependencies = tlas.dependencies.read();
 
                     if (*tlas_build_index).is_none() {
-                        return Err(ValidateAsActionsError::UsedUnbuiltTlas(
-                            tlas.error_ident(),
-                        ));
+                        return Err(ValidateAsActionsError::UsedUnbuiltTlas(tlas.error_ident()));
                     }
                     for blas in dependencies.deref() {
                         let blas_build_index = *blas.built_index.read();

wgpu-core/src/device/queue.rs

@@ -10,6 +10,7 @@ use smallvec::SmallVec;
 use thiserror::Error;
 
 use super::{life::LifetimeTracker, Device};
+use crate::device::resource::CommandIndices;
 #[cfg(feature = "trace")]
 use crate::device::trace::Action;
 use crate::scratch::ScratchBuffer;
@@ -37,7 +38,6 @@ use crate::{
     track::{self, Tracker, TrackerIndex},
     FastHashMap, SubmissionIndex,
 };
-use crate::device::resource::CommandIndices;
 
 pub struct Queue {
     raw: Box<dyn hal::DynQueue>,
@@ -1553,7 +1553,9 @@ fn validate_command_buffer(
             }
         }
 
-        if let Err(e) = cmd_buf_data.validate_acceleration_structure_actions(snatch_guard, command_index_guard) {
+        if let Err(e) =
+            cmd_buf_data.validate_acceleration_structure_actions(snatch_guard, command_index_guard)
+        {
             return Err(e.into());
         }
     }

wgpu-core/src/device/resource.rs

@@ -95,7 +95,7 @@ pub struct Device {
     /// so waiting for this value won't hang waiting for work that was never
     /// submitted.
     ///
-    /// [`active_submission_index`]: Device::active_submission_index
+    /// [`active_submission_index`]: CommandIndices::active_submission_index
     pub(crate) last_successful_submission_index: hal::AtomicFenceValue,
 
     // NOTE: if both are needed, the `snatchable_lock` must be consistently acquired before the
@@ -273,11 +273,14 @@ impl Device {
             zero_buffer: ManuallyDrop::new(zero_buffer),
             label: desc.label.to_string(),
             command_allocator,
-            command_indices: RwLock::new(rank::DEVICE_COMMAND_INDICES, CommandIndices {
-                active_submission_index: 0,
-                // By starting at one, we can put the result in a NonZeroU64.
-                next_acceleration_structure_build_command_index: 1,
-            }),
+            command_indices: RwLock::new(
+                rank::DEVICE_COMMAND_INDICES,
+                CommandIndices {
+                    active_submission_index: 0,
+                    // By starting at one, we can put the result in a NonZeroU64.
+                    next_acceleration_structure_build_command_index: 1,
+                },
+            ),
             last_successful_submission_index: AtomicU64::new(0),
             fence: RwLock::new(rank::DEVICE_FENCE, ManuallyDrop::new(fence)),
             snatchable_lock: unsafe { SnatchLock::new(rank::DEVICE_SNATCHABLE_LOCK) },

wgpu-core/src/ray_tracing.rs

@@ -208,7 +208,7 @@ pub(crate) struct AsBuild {
 #[derive(Debug, Clone)]
 pub(crate) enum AsAction {
     Build(AsBuild),
-    UseTlas(Arc<Tlas>)
+    UseTlas(Arc<Tlas>),
 }
 
 #[derive(Debug, Clone)]