From e2b0dee91f9d5a2c110c7631d8a784f377cbe72c Mon Sep 17 00:00:00 2001
From: Gurchetan Singh <gurchetansingh@google.com>
Date: Tue, 23 Sep 2025 08:11:57 -0700
Subject: [PATCH] virtio: virtgpu_kumquat: clippy fixes

Run clippy and fix the warnings.

Reviewed-by: David Gilhooley <djgilhooley.gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37530>
---
 src/virtio/virtgpu_kumquat/virtgpu_kumquat.rs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/virtio/virtgpu_kumquat/virtgpu_kumquat.rs b/src/virtio/virtgpu_kumquat/virtgpu_kumquat.rs
index a2d2f4d6670..06bdb79f1f5 100644
--- a/src/virtio/virtgpu_kumquat/virtgpu_kumquat.rs
+++ b/src/virtio/virtgpu_kumquat/virtgpu_kumquat.rs
@@ -119,7 +119,7 @@ impl VirtGpuKumquat {
                 _ => return Err(MesaError::Unsupported),
             };
 
-            capset_mask = 1u64 << resp_capset_info.capset_id | capset_mask;
+            capset_mask |= 1u64 << resp_capset_info.capset_id;
             capsets.insert(resp_capset_info.capset_id, capset);
         }
 
@@ -134,7 +134,7 @@ impl VirtGpuKumquat {
     }
 
     pub fn allocate_id(&mut self) -> u32 {
-        self.id_allocator = self.id_allocator + 1;
+        self.id_allocator += 1;
         self.id_allocator
     }
 
@@ -233,7 +233,7 @@ impl VirtGpuKumquat {
         create_blob: &mut VirtGpuResourceCreateBlob,
         blob_cmd: &[u8],
     ) -> MesaResult<()> {
-        if blob_cmd.len() != 0 {
+        if !blob_cmd.is_empty() {
             let submit_command = kumquat_gpu_protocol_cmd_submit {
                 hdr: kumquat_gpu_protocol_ctrl_hdr {
                     type_: KUMQUAT_GPU_PROTOCOL_SUBMIT_3D,
@@ -439,7 +439,7 @@ impl VirtGpuKumquat {
         }
 
         let need_fence =
-            bo_handles.len() != 0 || (flags & VIRTGPU_KUMQUAT_EXECBUF_FENCE_FD_OUT) != 0;
+            !bo_handles.is_empty() || (flags & VIRTGPU_KUMQUAT_EXECBUF_FENCE_FD_OUT) != 0;
 
         let actual_fence = (flags & VIRTGPU_KUMQUAT_EXECBUF_SHAREABLE_OUT) != 0
             && (flags & VIRTGPU_KUMQUAT_EXECBUF_FENCE_FD_OUT) != 0;
@@ -545,10 +545,10 @@ impl VirtGpuKumquat {
             )?;
             let mesa_mapping = mapping.as_mesa_mapping();
 
-            let mut slice: &mut [u8] = unsafe {
+            let slice: &mut [u8] = unsafe {
                 from_raw_parts_mut(mesa_mapping.ptr as *mut u8, VIRTGPU_KUMQUAT_PAGE_SIZE)
             };
-            let mut writer = Writer::new(&mut slice);
+            let mut writer = Writer::new(slice);
             writer.write_obj(resource.resource_id)?;
 
             // Opaque to users of this API, shared memory internally
@@ -578,10 +578,10 @@ impl VirtGpuKumquat {
 
         let mesa_mapping = mapping.as_mesa_mapping();
 
-        let mut slice: &mut [u8] =
+        let slice: &mut [u8] =
             unsafe { from_raw_parts_mut(mesa_mapping.ptr as *mut u8, VIRTGPU_KUMQUAT_PAGE_SIZE) };
 
-        let mut reader = Reader::new(&mut slice);
+        let mut reader = Reader::new(slice);
         *resource_handle = reader.read_obj()?;
 
         let attach_resource = kumquat_gpu_protocol_ctx_resource {