From 74a2456b050c7132af1be55447e98e045eae52a2 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Sun, 5 May 2024 16:47:44 +0200 Subject: [PATCH] misc: Fix clippy lints --- engine/narcissus-maths/tests/exhaustive_f32.rs | 2 +- engine/narcissus-sqlite/src/lib.rs | 2 +- title/shark/src/main.rs | 14 +++++++------- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/engine/narcissus-maths/tests/exhaustive_f32.rs b/engine/narcissus-maths/tests/exhaustive_f32.rs index 385b0db..e3c102b 100644 --- a/engine/narcissus-maths/tests/exhaustive_f32.rs +++ b/engine/narcissus-maths/tests/exhaustive_f32.rs @@ -456,7 +456,7 @@ pub fn exhaustive_tan_pi() { #[test] #[ignore] pub fn exhaustive_exp() { - let errors = check_exhaustive_f32(ref_exp_f32, |a| exp_f32(a), false); + let errors = check_exhaustive_f32(ref_exp_f32, exp_f32, false); println!("EXP: {errors:?}"); assert_eq!(errors.max_error_ulp, 1); } diff --git a/engine/narcissus-sqlite/src/lib.rs b/engine/narcissus-sqlite/src/lib.rs index 90cd3cd..e28a824 100644 --- a/engine/narcissus-sqlite/src/lib.rs +++ b/engine/narcissus-sqlite/src/lib.rs @@ -489,7 +489,7 @@ mod tests { for (name, age) in names_to_ages { statement .query() - .bind_text(name_index, &name) + .bind_text(name_index, name) .bind_i32(age_index, age) .execute() .unwrap(); diff --git a/title/shark/src/main.rs b/title/shark/src/main.rs index e0f133a..c066bb2 100644 --- a/title/shark/src/main.rs +++ b/title/shark/src/main.rs @@ -377,7 +377,7 @@ impl GameState { self.archetype_projectile[i / 8].velocity_x[i % 8] = velocity.x; self.archetype_projectile[i / 8].velocity_z[i % 8] = velocity.z; self.archetype_projectile[i / 8].lifetime[i % 8] = lifetime; - self.archetype_projectile_bitmap_1[i / 64] |= 1 << i % 64; + self.archetype_projectile_bitmap_1[i / 64] |= 1 << (i % 64); self.archetype_projectile_bitmap_0[i / 64 / 64] |= 1 << ((i / 64) % 64); } } @@ -472,12 +472,12 @@ pub fn main() { let blåhaj_buffer = device.request_transient_buffer_with_data( &frame, - &thread_token, + thread_token, BufferUsageFlags::TRANSFER, blåhaj_image_data.as_slice(), ); - let mut cmd_encoder = device.request_cmd_encoder(&frame, &thread_token); + let mut cmd_encoder = device.request_cmd_encoder(&frame, thread_token); { let cmd_encoder = &mut cmd_encoder; @@ -558,7 +558,7 @@ pub fn main() { let (width, height, swapchain_image) = loop { let (width, height) = main_window.extent(); if let Ok(result) = device.acquire_swapchain( - &frame, + frame, main_window.upcast(), width, height, @@ -682,12 +682,12 @@ pub fn main() { ); let clip_from_model = clip_from_camera * camera_from_model; - let mut cmd_encoder = device.request_cmd_encoder(&frame, &thread_token); + let mut cmd_encoder = device.request_cmd_encoder(frame, thread_token); { let cmd_encoder = &mut cmd_encoder; if width != depth_width || height != depth_height { - device.destroy_image(&frame, depth_image); + device.destroy_image(frame, depth_image); depth_image = device.create_image(&ImageDesc { memory_location: MemoryLocation::Device, host_mapped: false, @@ -1009,7 +1009,7 @@ pub fn main() { device.cmd_end_rendering(cmd_encoder); } - device.submit(&frame, cmd_encoder); + device.submit(frame, cmd_encoder); } device.end_frame(frame); } -- 2.49.0