From 31d4295277457f90707735e3afa3ae6aec87c784 Mon Sep 17 00:00:00 2001 From: Joshua Simmons Date: Sun, 4 Jun 2023 11:06:14 +0200 Subject: [PATCH] narcissus: Fix clippy lints --- bins/narcissus/src/helpers.rs | 2 +- bins/narcissus/src/main.rs | 2 +- bins/narcissus/src/mapped_buffer.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bins/narcissus/src/helpers.rs b/bins/narcissus/src/helpers.rs index dd3c3f5..5f9051f 100644 --- a/bins/narcissus/src/helpers.rs +++ b/bins/narcissus/src/helpers.rs @@ -103,7 +103,7 @@ where { // SAFETY: T: Blittable which implies it's freely convertable to a byte slice. unsafe { - let len = data.len() * std::mem::size_of::(); + let len = std::mem::size_of_val(data); let initial_data = std::slice::from_raw_parts(data.as_ptr() as *const u8, len); device.create_buffer_with_data( &BufferDesc { diff --git a/bins/narcissus/src/main.rs b/bins/narcissus/src/main.rs index 0e97806..a344d88 100644 --- a/bins/narcissus/src/main.rs +++ b/bins/narcissus/src/main.rs @@ -15,7 +15,7 @@ use narcissus_gpu::{ ImageUsageFlags, LoadOp, MemoryLocation, Offset2d, Offset3d, RenderingAttachment, RenderingDesc, Scissor, StoreOp, ThreadToken, Viewport, }; -use narcissus_maths::{sin_cos_pi_f32, vec3, Affine3, Deg, HalfTurn, Mat3, Mat4, Point3, Vec3}; +use narcissus_maths::{sin_cos_pi_f32, vec3, Affine3, HalfTurn, Mat3, Mat4, Point3, Vec3}; use pipelines::{BasicUniforms, GlyphInstance, TextUniforms}; mod fonts; diff --git a/bins/narcissus/src/mapped_buffer.rs b/bins/narcissus/src/mapped_buffer.rs index 60ae3ce..98300e7 100644 --- a/bins/narcissus/src/mapped_buffer.rs +++ b/bins/narcissus/src/mapped_buffer.rs @@ -48,7 +48,7 @@ impl<'a> MappedBuffer<'a> { T: Blittable, { unsafe { - let len = values.len() * std::mem::size_of::(); + let len = std::mem::size_of_val(values); let src = std::slice::from_raw_parts(values.as_ptr() as *const u8, len); self.slice[..len].copy_from_slice(src) } -- 2.49.0