From: Josh Simmons Date: Fri, 29 Nov 2024 21:15:55 +0000 (+0100) Subject: misc: Fix clippy lints X-Git-Url: https://git.nega.tv//gitweb.cgi?a=commitdiff_plain;h=c1da07aab2cd18f9da3a39589681a271929ba83e;p=josh%2Fnarcissus misc: Fix clippy lints --- diff --git a/engine/narcissus-core/src/fixed_vec.rs b/engine/narcissus-core/src/fixed_vec.rs index 605c626..c036291 100644 --- a/engine/narcissus-core/src/fixed_vec.rs +++ b/engine/narcissus-core/src/fixed_vec.rs @@ -325,7 +325,7 @@ impl FixedVec { vec: &'a mut FixedVec, } - impl<'a, T, const CAP: usize> Drop for FillGapOnDrop<'a, T, CAP> { + impl Drop for FillGapOnDrop<'_, T, CAP> { fn drop(&mut self) { /* This code gets executed when `same_bucket` panics */ diff --git a/engine/narcissus-core/src/rand.rs b/engine/narcissus-core/src/rand.rs index d333e10..84c343f 100644 --- a/engine/narcissus-core/src/rand.rs +++ b/engine/narcissus-core/src/rand.rs @@ -296,7 +296,7 @@ mod tests { let mut rng = Pcg64::new(); for _ in 0..100_000 { let x = rng.next_f32(); - assert!(x >= 0.0 && x < 1.0); + assert!((0.0..1.0).contains(&x)); } } @@ -305,7 +305,7 @@ mod tests { let mut rng = Pcg64::new(); for _ in 0..100_000 { let x = rng.next_f64(); - assert!(x >= 0.0 && x < 1.0); + assert!((0.0..1.0).contains(&x)); } } @@ -314,7 +314,7 @@ mod tests { let mut rng = Pcg64::new(); for _ in 0..100_000 { let x = rng.next_f32_s(); - assert!(x >= -1.0 && x < 1.0); + assert!((-1.0..1.0).contains(&x)); } } @@ -323,7 +323,7 @@ mod tests { let mut rng = Pcg64::new(); for _ in 0..100_000 { let x = rng.next_f64_s(); - assert!(x >= -1.0 && x < 1.0); + assert!((-1.0..1.0).contains(&x)); } } } diff --git a/engine/narcissus-core/src/ref_count.rs b/engine/narcissus-core/src/ref_count.rs index a292da9..1b8ba0b 100644 --- a/engine/narcissus-core/src/ref_count.rs +++ b/engine/narcissus-core/src/ref_count.rs @@ -315,7 +315,7 @@ mod tests { use std::sync::atomic::{AtomicU32, Ordering}; struct A<'a>(&'a AtomicU32); - impl<'a> Drop for A<'a> { + impl Drop for A<'_> { fn drop(&mut self) { self.0.fetch_add(1, Ordering::SeqCst); } diff --git a/engine/narcissus-core/src/svg.rs b/engine/narcissus-core/src/svg.rs index dc43136..1367cab 100644 --- a/engine/narcissus-core/src/svg.rs +++ b/engine/narcissus-core/src/svg.rs @@ -245,7 +245,7 @@ impl<'a> Rect<'a> { } } -impl<'a> fmt::Display for Rect<'a> { +impl fmt::Display for Rect<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { if let Some(title) = self.title { write!( @@ -372,7 +372,7 @@ where pub text: &'a T, } -impl<'a, T> fmt::Display for Text<'a, T> +impl fmt::Display for Text<'_, T> where T: fmt::Display, { diff --git a/engine/narcissus-gpu/src/lib.rs b/engine/narcissus-gpu/src/lib.rs index 4ea89b1..635beb0 100644 --- a/engine/narcissus-gpu/src/lib.rs +++ b/engine/narcissus-gpu/src/lib.rs @@ -290,7 +290,7 @@ pub struct ShaderDesc<'a> { pub code: &'a [u8], } -impl<'a> Default for ShaderDesc<'a> { +impl Default for ShaderDesc<'_> { fn default() -> Self { Self { entry: c"main", @@ -535,7 +535,7 @@ pub struct BindDesc<'a> { pub immutable_samplers: &'a [Sampler], } -impl<'a> BindDesc<'a> { +impl BindDesc<'_> { pub const fn new(stages: ShaderStageFlags, binding_type: BindingType) -> BindDesc<'static> { BindDesc { slot: !0, @@ -587,7 +587,7 @@ pub struct BufferAddress<'a> { phantom: PhantomData<&'a [u8]>, } -impl<'a> BufferAddress<'a> { +impl BufferAddress<'_> { #[inline(always)] #[must_use] pub fn as_raw(self) -> u64 { @@ -859,7 +859,7 @@ pub struct Frame<'a> { _phantom: &'a PhantomData<()>, } -impl<'a> Frame<'a> { +impl Frame<'_> { fn check_device(&self, device_addr: usize) { assert_eq!(self.device_addr, device_addr, "frame device mismatch") } diff --git a/engine/narcissus-gpu/src/mapped_buffer.rs b/engine/narcissus-gpu/src/mapped_buffer.rs index 3e99aa3..0a49944 100644 --- a/engine/narcissus-gpu/src/mapped_buffer.rs +++ b/engine/narcissus-gpu/src/mapped_buffer.rs @@ -63,7 +63,7 @@ pub struct PersistentBuffer<'a> { pub(crate) phantom: PhantomData<&'a u8>, } -impl<'a> PersistentBuffer<'a> { +impl PersistentBuffer<'_> { pub fn to_arg(&self) -> BufferArg { BufferArg::Persistent(self) } @@ -93,7 +93,7 @@ pub struct TransientBuffer<'a> { pub(crate) address: BufferAddress<'a>, } -impl<'a> TransientBuffer<'a> { +impl TransientBuffer<'_> { pub fn to_arg(&self) -> BufferArg { BufferArg::Transient(self) } diff --git a/engine/narcissus-sqlite/src/lib.rs b/engine/narcissus-sqlite/src/lib.rs index e28a824..6a6efac 100644 --- a/engine/narcissus-sqlite/src/lib.rs +++ b/engine/narcissus-sqlite/src/lib.rs @@ -277,7 +277,7 @@ pub struct Query<'a> { statement: &'a Statement<'a>, } -impl<'a> Drop for Query<'a> { +impl Drop for Query<'_> { fn drop(&mut self) { let _ = unsafe { ffi::sqlite3_clear_bindings(self.statement.statement) }; let _ = unsafe { ffi::sqlite3_reset(self.statement.statement) }; @@ -355,7 +355,7 @@ pub struct Statement<'a> { marker: PhantomData<&'a Connection>, } -impl<'a> Statement<'a> { +impl Statement<'_> { pub fn parameter_index(&mut self, parameter: &str) -> Option { let name = CString::new(parameter).unwrap(); let index = unsafe { ffi::sqlite3_bind_parameter_index(self.statement, name.as_ptr()) }; @@ -367,7 +367,7 @@ impl<'a> Statement<'a> { } } -impl<'conn> Drop for Statement<'conn> { +impl Drop for Statement<'_> { fn drop(&mut self) { let _ret = unsafe { ffi::sqlite3_finalize(self.statement) }; } @@ -377,7 +377,7 @@ pub struct Row<'stmt> { statement: &'stmt Statement<'stmt>, } -impl<'stmt> Row<'stmt> { +impl Row<'_> { pub fn column_i32(&mut self, column: i32) -> i32 { unsafe { ffi::sqlite3_column_int(self.statement.statement, column) } } @@ -447,7 +447,7 @@ impl<'stmt> Iterator for Rows<'stmt> { } } -impl<'stmt> Drop for Rows<'stmt> { +impl Drop for Rows<'_> { fn drop(&mut self) { if let Some(statement) = self.statement.take() { let _ = unsafe { ffi::sqlite3_reset(statement.statement) }; diff --git a/external/blake3-smol/src/guts.rs b/external/blake3-smol/src/guts.rs index ecde326..0ddae10 100644 --- a/external/blake3-smol/src/guts.rs +++ b/external/blake3-smol/src/guts.rs @@ -83,11 +83,11 @@ mod test { let mut hasher = crate::Hasher::new(); let mut buf = [0; crate::CHUNK_LEN]; - buf[0] = 'a' as u8; + buf[0] = b'a'; hasher.update(&buf); let chunk0_cv = ChunkState::new(0).update(&buf).finalize(false); - buf[0] = 'b' as u8; + buf[0] = b'b'; hasher.update(&buf); let chunk1_cv = ChunkState::new(1).update(&buf).finalize(false); diff --git a/external/blake3-smol/src/reference.rs b/external/blake3-smol/src/reference.rs index 83ac795..71b3cab 100644 --- a/external/blake3-smol/src/reference.rs +++ b/external/blake3-smol/src/reference.rs @@ -154,12 +154,11 @@ impl Output { } fn root_output_bytes(&self, out_slice: &mut [u8]) { - let mut output_block_counter = 0; - for out_block in out_slice.chunks_mut(2 * OUT_LEN) { + for (output_block_counter, out_block) in out_slice.chunks_mut(2 * OUT_LEN).enumerate() { let words = compress( &self.input_chaining_value, &self.block_words, - output_block_counter, + output_block_counter as u64, self.block_len, self.flags | ROOT, ); @@ -167,7 +166,6 @@ impl Output { for (word, out_word) in words.iter().zip(out_block.chunks_mut(4)) { out_word.copy_from_slice(&word.to_le_bytes()[..out_word.len()]); } - output_block_counter += 1; } } } diff --git a/external/blake3-smol/src/slice.rs b/external/blake3-smol/src/slice.rs index 20e090c..3f67fe4 100644 --- a/external/blake3-smol/src/slice.rs +++ b/external/blake3-smol/src/slice.rs @@ -1,12 +1,12 @@ #![allow(unused)] +//! Shim implementation of some unstable Rust stdlib functions. + use std::{ iter::FusedIterator, slice::{Iter, IterMut}, }; -/// Shim implementation of some unstable Rust stdlib functions. - /// An iterator over a slice in (non-overlapping) chunks (`N` elements at a /// time), starting at the beginning of the slice. /// diff --git a/external/blake3-smol/src/test.rs b/external/blake3-smol/src/test.rs index a6b8867..183e8b7 100644 --- a/external/blake3-smol/src/test.rs +++ b/external/blake3-smol/src/test.rs @@ -1,5 +1,4 @@ use crate::{slice, CVBytes, CVWords, IncrementCounter, Refs, BLOCK_LEN, CHUNK_LEN, OUT_LEN}; -use core::usize; use rand::prelude::*; // Interesting input lengths to run tests on. @@ -81,13 +80,12 @@ pub fn test_compress_fn(compress_in_place_fn: CompressInPlaceFn, compress_xof_fn let flags = crate::CHUNK_END | crate::ROOT | crate::KEYED_HASH; let portable_out = - crate::portable::compress_xof(&initial_state, &block, block_len, counter as u64, flags); + crate::portable::compress_xof(&initial_state, &block, block_len, counter, flags); let mut test_state = initial_state; - unsafe { compress_in_place_fn(&mut test_state, &block, block_len, counter as u64, flags) }; + unsafe { compress_in_place_fn(&mut test_state, &block, block_len, counter, flags) }; let test_state_bytes = crate::platform::le_bytes_from_words_32(&test_state); - let test_xof = - unsafe { compress_xof_fn(&initial_state, &block, block_len, counter as u64, flags) }; + let test_xof = unsafe { compress_xof_fn(&initial_state, &block, block_len, counter, flags) }; assert_eq!(&portable_out[..32], &test_state_bytes[..]); assert_eq!(&portable_out[..], &test_xof[..]); @@ -289,11 +287,11 @@ fn test_compare_reference() { // all at once let test_out = crate::hash(input); - assert_eq!(test_out, *&expected_out[..32]); + assert_eq!(test_out, expected_out[..32]); // incremental let mut hasher = crate::Hasher::new(); hasher.update(input); - assert_eq!(hasher.finalize(), *&expected_out[..32]); + assert_eq!(hasher.finalize(), expected_out[..32]); assert_eq!(hasher.finalize(), test_out); // xof let mut extended = [0; OUT]; @@ -310,11 +308,11 @@ fn test_compare_reference() { // all at once let test_out = crate::keyed_hash(&TEST_KEY, input); - assert_eq!(test_out, *&expected_out[..32]); + assert_eq!(test_out, expected_out[..32]); // incremental let mut hasher = crate::Hasher::new_keyed(&TEST_KEY); hasher.update(input); - assert_eq!(hasher.finalize(), *&expected_out[..32]); + assert_eq!(hasher.finalize(), expected_out[..32]); assert_eq!(hasher.finalize(), test_out); // xof let mut extended = [0; OUT]; @@ -336,8 +334,8 @@ fn test_compare_reference() { // incremental let mut hasher = crate::Hasher::new_derive_key(context); hasher.update(input); - assert_eq!(hasher.finalize(), *&expected_out[..32]); - assert_eq!(hasher.finalize(), *&test_out[..32]); + assert_eq!(hasher.finalize(), expected_out[..32]); + assert_eq!(hasher.finalize(), test_out[..32]); // xof let mut extended = [0; OUT]; hasher.finalize_xof().fill(&mut extended); @@ -474,8 +472,8 @@ fn test_msg_schdule_permutation() { generated[0] = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15]; for round in 1..7 { - for i in 0..16 { - generated[round][i] = generated[round - 1][permutation[i]]; + for (i, &permutation) in permutation.iter().enumerate() { + generated[round][i] = generated[round - 1][permutation]; } } diff --git a/external/vulkan-sys/examples/triangle.rs b/external/vulkan-sys/examples/triangle.rs index 09f2b51..720271e 100644 --- a/external/vulkan-sys/examples/triangle.rs +++ b/external/vulkan-sys/examples/triangle.rs @@ -131,9 +131,9 @@ pub fn main() { let mut features_11 = vk::PhysicalDeviceVulkan11Features::default(); let mut features = vk::PhysicalDeviceFeatures2::default(); unsafe { - features._next = std::mem::transmute::<_, *mut c_void>(&mut features_11); - features_11._next = std::mem::transmute::<_, *mut c_void>(&mut features_12); - features_12._next = std::mem::transmute::<_, *mut c_void>(&mut features_13); + features._next = &mut features_11 as *mut _ as *mut c_void; + features_11._next = &mut features_12 as *mut _ as *mut c_void; + features_12._next = &mut features_13 as *mut _ as *mut c_void; instance_fn.get_physical_device_features2(physical_device, &mut features); } (features.features, features_11, features_12, features_13) @@ -166,7 +166,7 @@ pub fn main() { }) .expect("failed to find universal queue for chosen device"); - let device = unsafe { + let device = { let queue_priorities = &[1.0]; let device_queue_create_infos = &[vk::DeviceQueueCreateInfo { queue_family_index, @@ -179,20 +179,20 @@ pub fn main() { ..default() }; let enabled_features_12 = vk::PhysicalDeviceVulkan12Features { - _next: std::mem::transmute::<_, *mut c_void>(&enabled_features_13), + _next: &enabled_features_13 as *const _ as *mut c_void, timeline_semaphore: vk::Bool32::True, ..default() }; let enabled_features_11 = vk::PhysicalDeviceVulkan11Features { - _next: std::mem::transmute::<_, *mut c_void>(&enabled_features_12), + _next: &enabled_features_12 as *const _ as *mut c_void, ..default() }; let enabled_features = vk::PhysicalDeviceFeatures2 { - _next: std::mem::transmute::<_, *mut c_void>(&enabled_features_11), + _next: &enabled_features_11 as *const _ as *mut c_void, ..default() }; let create_info = vk::DeviceCreateInfo { - _next: std::mem::transmute::<_, *mut c_void>(&enabled_features), + _next: &enabled_features as *const _ as *mut c_void, queue_create_infos: device_queue_create_infos.into(), ..default() }; diff --git a/external/vulkan-sys/src/lib.rs b/external/vulkan-sys/src/lib.rs index cfe5e95..9be6402 100644 --- a/external/vulkan-sys/src/lib.rs +++ b/external/vulkan-sys/src/lib.rs @@ -103,7 +103,7 @@ pub struct VulkanSlice1<'a, I, T, const PAD: usize> { phantom: PhantomData<&'a T>, } -impl<'a, I, T, const PAD: usize> std::fmt::Debug for VulkanSlice1<'a, I, T, PAD> +impl std::fmt::Debug for VulkanSlice1<'_, I, T, PAD> where I: TryInto + Copy, T: std::fmt::Debug, @@ -115,7 +115,7 @@ where } } -impl<'a, I: Default, T, const PAD: usize> Default for VulkanSlice1<'a, I, T, PAD> { +impl Default for VulkanSlice1<'_, I, T, PAD> { fn default() -> Self { Self { len: Default::default(), @@ -126,7 +126,7 @@ impl<'a, I: Default, T, const PAD: usize> Default for VulkanSlice1<'a, I, T, PAD } } -impl<'a, I, T, const PAD: usize> VulkanSlice1<'a, I, T, PAD> { +impl VulkanSlice1<'_, I, T, PAD> { pub const fn dangling(len: I) -> Self { Self { len, @@ -206,7 +206,7 @@ pub struct VulkanSlice2<'a, I, T0, T1, const PAD: usize> { phantom1: PhantomData<&'a T1>, } -impl<'a, I, T0, T1, const PAD: usize> std::fmt::Debug for VulkanSlice2<'a, I, T0, T1, PAD> +impl std::fmt::Debug for VulkanSlice2<'_, I, T0, T1, PAD> where I: TryInto + Copy, T0: std::fmt::Debug, @@ -221,7 +221,7 @@ where } } -impl<'a, I: Default, T0, T1, const PAD: usize> Default for VulkanSlice2<'a, I, T0, T1, PAD> { +impl Default for VulkanSlice2<'_, I, T0, T1, PAD> { fn default() -> Self { Self { len: Default::default(), diff --git a/external/vulkan-sys/src/structs.rs b/external/vulkan-sys/src/structs.rs index 9f48b96..5378103 100644 --- a/external/vulkan-sys/src/structs.rs +++ b/external/vulkan-sys/src/structs.rs @@ -100,7 +100,7 @@ pub struct DeviceQueueCreateInfo<'a> { pub queue_priorities: VulkanSlice1<'a, u32, f32, 4>, } -impl<'a> Default for DeviceQueueCreateInfo<'a> { +impl Default for DeviceQueueCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::DeviceQueueCreateInfo; @@ -119,7 +119,7 @@ pub struct DeviceCreateInfo<'a> { pub enabled_features: *const PhysicalDeviceFeatures, } -impl<'a> Default for DeviceCreateInfo<'a> { +impl Default for DeviceCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::DeviceCreateInfo; @@ -156,7 +156,7 @@ pub struct InstanceCreateInfo<'a> { pub enabled_extension_names: VulkanSlice1<'a, u32, *const c_char, 4>, } -impl<'a> Default for InstanceCreateInfo<'a> { +impl Default for InstanceCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::InstanceCreateInfo; @@ -438,7 +438,7 @@ pub struct SubmitInfo<'a> { pub signal_semaphores: VulkanSlice1<'a, u32, Semaphore, 4>, } -impl<'a> Default for SubmitInfo<'a> { +impl Default for SubmitInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::SubmitInfo; @@ -456,7 +456,7 @@ pub struct SubmitInfo2<'a> { pub signal_semaphore_infos: VulkanSlice1<'a, u32, SemaphoreSubmitInfo, 4>, } -impl<'a> Default for SubmitInfo2<'a> { +impl Default for SubmitInfo2<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::SubmitInfo2; @@ -540,7 +540,7 @@ pub struct ImageFormatListCreateInfo<'a> { pub view_formats: VulkanSlice1<'a, u32, Format, 4>, } -impl<'a> Default for ImageFormatListCreateInfo<'a> { +impl Default for ImageFormatListCreateInfo<'_> { fn default() -> Self { ImageFormatListCreateInfo { _type: StructureType::ImageFormatListCreateInfo, @@ -611,7 +611,7 @@ pub struct SwapchainPresentModesCreateInfoEXT<'a> { pub present_modes: VulkanSlice1<'a, u32, PresentModeKHR, 4>, } -impl<'a> Default for SwapchainPresentModesCreateInfoEXT<'a> { +impl Default for SwapchainPresentModesCreateInfoEXT<'_> { fn default() -> Self { Self { _type: StructureType::SwapchainPresentModesCreateInfoExt, @@ -628,7 +628,7 @@ pub struct SurfacePresentModeCompatibilityEXT<'a> { pub present_modes: VulkanSlice1<'a, u32, PresentModeKHR, 4>, } -impl<'a> Default for SurfacePresentModeCompatibilityEXT<'a> { +impl Default for SurfacePresentModeCompatibilityEXT<'_> { fn default() -> Self { Self { _type: StructureType::SurfacePresentModeCompatibilityExt, @@ -681,7 +681,7 @@ pub struct SwapchainPresentFenceInfoEXT<'a> { pub fences: VulkanSlice1<'a, u32, Fence, 4>, } -impl<'a> Default for SwapchainPresentFenceInfoEXT<'a> { +impl Default for SwapchainPresentFenceInfoEXT<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::SwapchainPresentFenceInfoExt; @@ -697,7 +697,7 @@ pub struct ReleaseSwapchainImagesInfoEXT<'a> { pub image_indices: VulkanSlice1<'a, u32, u32, 4>, } -impl<'a> Default for ReleaseSwapchainImagesInfoEXT<'a> { +impl Default for ReleaseSwapchainImagesInfoEXT<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::ReleaseSwapchainImagesInfoExt; @@ -740,7 +740,7 @@ pub struct SwapchainCreateInfoKHR<'a> { pub old_swapchain: SwapchainKHR, } -impl<'a> Default for SwapchainCreateInfoKHR<'a> { +impl Default for SwapchainCreateInfoKHR<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::SwapchainCreateInfoKhr; @@ -760,7 +760,7 @@ pub struct PresentInfoKHR<'a> { pub results: *mut Result, } -impl<'a> Default for PresentInfoKHR<'a> { +impl Default for PresentInfoKHR<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::PresentInfoKhr; @@ -810,7 +810,7 @@ pub struct ImageCreateInfo<'a> { pub initial_layout: ImageLayout, } -impl<'a> Default for ImageCreateInfo<'a> { +impl Default for ImageCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::ImageCreateInfo; @@ -917,7 +917,7 @@ pub struct CommandBufferBeginInfo<'a> { pub inheritance_info: Option<&'a CommandBufferInheritanceInfo>, } -impl<'a> Default for CommandBufferBeginInfo<'a> { +impl Default for CommandBufferBeginInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::CommandBufferBeginInfo; @@ -960,7 +960,7 @@ pub struct RenderingInfo<'a> { pub stencil_attachment: Option<&'a RenderingAttachmentInfo>, } -impl<'a> Default for RenderingInfo<'a> { +impl Default for RenderingInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::RenderingInfo; @@ -978,7 +978,7 @@ pub struct PipelineRenderingCreateInfo<'a> { pub stencil_attachment_format: Format, } -impl<'a> Default for PipelineRenderingCreateInfo<'a> { +impl Default for PipelineRenderingCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::PipelineRenderingCreateInfo; @@ -1094,7 +1094,7 @@ pub struct RenderPassBeginInfo<'a> { pub clear_values: VulkanSlice1<'a, u32, ClearValue, 4>, } -impl<'a> Default for RenderPassBeginInfo<'a> { +impl Default for RenderPassBeginInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::RenderPassBeginInfo; @@ -1182,7 +1182,7 @@ pub struct DependencyInfo<'a> { pub image_memory_barriers: VulkanSlice1<'a, u32, ImageMemoryBarrier2, 4>, } -impl<'a> Default for DependencyInfo<'a> { +impl Default for DependencyInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::DependencyInfo; @@ -1230,7 +1230,7 @@ pub struct SubpassDescription<'a> { pub preserve_attachments: VulkanSlice1<'a, u32, u32, 4>, } -impl<'a> Default for SubpassDescription<'a> { +impl Default for SubpassDescription<'_> { fn default() -> Self { unsafe { MaybeUninit::zeroed().assume_init() } } @@ -1259,7 +1259,7 @@ pub struct RenderPassCreateInfo<'a> { pub dependencies: VulkanSlice1<'a, u32, SubpassDependency, 4>, } -impl<'a> Default for RenderPassCreateInfo<'a> { +impl Default for RenderPassCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::RenderPassCreateInfo; @@ -1276,7 +1276,7 @@ pub struct ShaderModuleCreateInfo<'a> { pub code: VulkanSlice1<'a, usize, u8, 0>, } -impl<'a> Default for ShaderModuleCreateInfo<'a> { +impl Default for ShaderModuleCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::ShaderModuleCreateInfo; @@ -1307,7 +1307,7 @@ pub struct DescriptorSetLayoutCreateInfo<'a> { pub bindings: VulkanSlice1<'a, u32, DescriptorSetLayoutBinding, 0>, } -impl<'a> Default for DescriptorSetLayoutCreateInfo<'a> { +impl Default for DescriptorSetLayoutCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::DescriptorSetLayoutCreateInfo; @@ -1331,7 +1331,7 @@ pub struct DescriptorPoolCreateInfo<'a> { pub pool_sizes: VulkanSlice1<'a, u32, DescriptorPoolSize, 4>, } -impl<'a> Default for DescriptorPoolCreateInfo<'a> { +impl Default for DescriptorPoolCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::DescriptorPoolCreateInfo; @@ -1347,7 +1347,7 @@ pub struct DescriptorSetAllocateInfo<'a> { pub set_layouts: VulkanSlice1<'a, u32, DescriptorSetLayout, 4>, } -impl<'a> Default for DescriptorSetAllocateInfo<'a> { +impl Default for DescriptorSetAllocateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::DescriptorSetAllocateInfo; @@ -1372,7 +1372,7 @@ pub struct SpecializationInfo<'a> { pub data: VulkanSlice1<'a, usize, u8, 0>, } -impl<'a> Default for SpecializationInfo<'a> { +impl Default for SpecializationInfo<'_> { fn default() -> Self { unsafe { MaybeUninit::::zeroed().assume_init() } } @@ -1392,7 +1392,7 @@ pub struct PipelineShaderStageCreateInfo<'a> { pub specialization_info: Option<&'a SpecializationInfo<'a>>, } -impl<'a> Default for PipelineShaderStageCreateInfo<'a> { +impl Default for PipelineShaderStageCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::PipelineShaderStageCreateInfo; @@ -1429,7 +1429,7 @@ pub struct ComputePipelineCreateInfo<'a> { pub base_pipeline_index: i32, } -impl<'a> Default for ComputePipelineCreateInfo<'a> { +impl Default for ComputePipelineCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::ComputePipelineCreateInfo; @@ -1468,7 +1468,7 @@ pub struct PipelineVertexInputStateCreateInfo<'a> { pub vertex_attribute_descriptions: VulkanSlice1<'a, u32, VertexInputAttributeDescription, 4>, } -impl<'a> Default for PipelineVertexInputStateCreateInfo<'a> { +impl Default for PipelineVertexInputStateCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::PipelineVertexInputStateCreateInfo; @@ -1518,7 +1518,7 @@ pub struct PipelineViewportStateCreateInfo<'a> { pub scissors: VulkanSlice1<'a, u32, Rect2d, 4>, } -impl<'a> Default for PipelineViewportStateCreateInfo<'a> { +impl Default for PipelineViewportStateCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::PipelineViewportStateCreateInfo; @@ -1601,7 +1601,7 @@ pub struct PipelineColorBlendStateCreateInfo<'a> { pub blend_constants: [f32; 4], } -impl<'a> Default for PipelineColorBlendStateCreateInfo<'a> { +impl Default for PipelineColorBlendStateCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::PipelineColorBlendStateCreateInfo; @@ -1617,7 +1617,7 @@ pub struct PipelineDynamicStateCreateInfo<'a> { pub dynamic_states: VulkanSlice1<'a, u32, DynamicState, 0>, } -impl<'a> Default for PipelineDynamicStateCreateInfo<'a> { +impl Default for PipelineDynamicStateCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::PipelineDynamicStateCreateInfo; @@ -1686,7 +1686,7 @@ pub struct GraphicsPipelineCreateInfo<'a> { pub base_pipeline_index: i32, } -impl<'a> Default for GraphicsPipelineCreateInfo<'a> { +impl Default for GraphicsPipelineCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::GraphicsPipelineCreateInfo; @@ -1742,7 +1742,7 @@ pub struct PipelineLayoutCreateInfo<'a> { pub push_constant_ranges: VulkanSlice1<'a, u32, PushConstantRange, 4>, } -impl<'a> Default for PipelineLayoutCreateInfo<'a> { +impl Default for PipelineLayoutCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::PipelineLayoutCreateInfo; @@ -1876,7 +1876,7 @@ pub struct BufferCreateInfo<'a> { pub queue_family_indices: VulkanSlice1<'a, u32, u32, 4>, } -impl<'a> Default for BufferCreateInfo<'a> { +impl Default for BufferCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::BufferCreateInfo; @@ -1963,7 +1963,7 @@ pub struct FramebufferCreateInfo<'a> { pub layers: u32, } -impl<'a> Default for FramebufferCreateInfo<'a> { +impl Default for FramebufferCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::FramebufferCreateInfo; @@ -1983,7 +1983,7 @@ pub struct FramebufferAttachmentImageInfo<'a> { view_formats: VulkanSlice1<'a, u32, Format, 0>, } -impl<'a> Default for FramebufferAttachmentImageInfo<'a> { +impl Default for FramebufferAttachmentImageInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::FramebufferAttachmentImageInfo; @@ -1998,7 +1998,7 @@ pub struct FramebufferAttachmentsCreateInfo<'a> { attachment_image_infos: VulkanSlice1<'a, u32, FramebufferAttachmentImageInfo<'a>, 4>, } -impl<'a> Default for FramebufferAttachmentsCreateInfo<'a> { +impl Default for FramebufferAttachmentsCreateInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::FramebufferAttachmentsCreateInfo; @@ -2060,7 +2060,7 @@ pub struct TimelineSemaphoreSubmitInfo<'a> { pub signal_semaphore_values: VulkanSlice1<'a, u32, u64, 4>, } -impl<'a> Default for TimelineSemaphoreSubmitInfo<'a> { +impl Default for TimelineSemaphoreSubmitInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::TimelineSemaphoreSubmitInfo; @@ -2076,7 +2076,7 @@ pub struct SemaphoreWaitInfo<'a> { pub semaphores: VulkanSlice2<'a, u32, Semaphore, u64, 0>, } -impl<'a> Default for SemaphoreWaitInfo<'a> { +impl Default for SemaphoreWaitInfo<'_> { fn default() -> Self { let mut x = unsafe { MaybeUninit::::zeroed().assume_init() }; x._type = StructureType::SemaphoreWaitInfo; @@ -2204,7 +2204,6 @@ impl Default for DebugUtilsLabelExt { } #[repr(C)] - pub struct DebugUtilsObjectTagInfoExt { pub _type: StructureType, pub _next: *const c_void, @@ -2377,7 +2376,6 @@ pub struct PhysicalDeviceLimits { pub max_tessellation_control_per_patch_output_components: u32, /// max total number of per-vertex and per-patch output components in TCS pub max_tessellation_control_total_output_components: u32, - /// tessellation evaluation stage limits /// max number of input components per vertex in TES pub max_tessellation_evaluation_input_components: u32, diff --git a/title/shark-shaders/src/pipelines.rs b/title/shark-shaders/src/pipelines.rs index 4304d6e..408f570 100644 --- a/title/shark-shaders/src/pipelines.rs +++ b/title/shark-shaders/src/pipelines.rs @@ -259,7 +259,7 @@ pub const RADIX_ITEMS_PER_WGP: usize = 4096; pub const RADIX_DIGITS: usize = 256; pub fn calcuate_workgroup_count(count: usize) -> usize { - (count + (RADIX_ITEMS_PER_WGP - 1)) / RADIX_ITEMS_PER_WGP + count.div_ceil(RADIX_ITEMS_PER_WGP) } /// Returns the size of the spine required to sort the given count in units of u32 words. diff --git a/title/shark/src/fonts.rs b/title/shark/src/fonts.rs index f231fe9..3674f61 100644 --- a/title/shark/src/fonts.rs +++ b/title/shark/src/fonts.rs @@ -11,7 +11,7 @@ pub struct Fonts<'a> { roboto_regular: Font<'a>, } -impl<'a> Fonts<'a> { +impl Fonts<'_> { pub fn new() -> Self { // SAFETY: Safe because Roboto-Regular.ttf is a valid ttf font embedded // in the application. diff --git a/title/shark/src/main.rs b/title/shark/src/main.rs index e7fc9f9..db7a294 100644 --- a/title/shark/src/main.rs +++ b/title/shark/src/main.rs @@ -1057,8 +1057,8 @@ impl<'gpu> DrawState<'gpu> { gpu.destroy_image(frame, self.color_image); gpu.destroy_image(frame, self.ui_image); - self.tile_resolution_x = (width + (DRAW_2D_TILE_SIZE - 1)) / DRAW_2D_TILE_SIZE; - self.tile_resolution_y = (height + (DRAW_2D_TILE_SIZE - 1)) / DRAW_2D_TILE_SIZE; + self.tile_resolution_x = width.div_ceil(DRAW_2D_TILE_SIZE); + self.tile_resolution_y = height.div_ceil(DRAW_2D_TILE_SIZE); self.depth_image = gpu.create_image(&ImageDesc { memory_location: MemoryLocation::Device, @@ -1469,9 +1469,7 @@ impl<'gpu> DrawState<'gpu> { gpu.cmd_dispatch( cmd_encoder, - (draw_buffer_len - + (self.pipelines.draw_2d_bin_1_scatter_pipeline_workgroup_size - 1)) - / self.pipelines.draw_2d_bin_1_scatter_pipeline_workgroup_size, + draw_buffer_len.div_ceil(self.pipelines.draw_2d_bin_1_scatter_pipeline_workgroup_size), 1, 1, );