From 83d93985f57c3d9f50605656d5b72e968a6bb0bd Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Thu, 20 Feb 2025 15:35:30 -0700 Subject: [PATCH] Address clippy lints Fix the following: - clippy::manual_div_ceil - clippy::needless_lifetimes - clippy::precedence - clippy::repr_packed_without_abi Signed-off-by: Tim Crawford --- src/app/cmos.rs | 2 +- src/app/ec.rs | 4 ++-- src/app/pci.rs | 4 ++-- src/display.rs | 2 +- src/image/mod.rs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/app/cmos.rs b/src/app/cmos.rs index 51835d0..930422b 100644 --- a/src/app/cmos.rs +++ b/src/app/cmos.rs @@ -58,7 +58,7 @@ impl CmosOptionTable { let hi = u16::from(self.cmos.read(Self::CHECKSUM_OFFSET)); let lo = u16::from(self.cmos.read(Self::CHECKSUM_OFFSET + 1)); - hi << 8 | lo + (hi << 8) | lo } /// Write the checksum to the CMOS option table. diff --git a/src/app/ec.rs b/src/app/ec.rs index 60c80bc..16bdacd 100644 --- a/src/app/ec.rs +++ b/src/app/ec.rs @@ -404,7 +404,7 @@ impl SpiLegacy { unsafe fn read(&mut self, data: &mut [u8]) -> core::result::Result<(), ectool::Error> { let block_size = self.block_size(); - let blocks = (data.len() + block_size - 1) / block_size; + let blocks = data.len().div_ceil(block_size); for block in 0..blocks { unsafe { self.pmc_cmd(0x03)?; @@ -427,7 +427,7 @@ impl SpiLegacy { unsafe fn write(&mut self, data: &[u8]) -> core::result::Result<(), ectool::Error> { let block_size = self.block_size(); - let blocks = (data.len() + block_size - 1) / block_size; + let blocks = data.len().div_ceil(block_size); for block in 0..blocks { unsafe { self.pmc_cmd(0x02)?; diff --git a/src/app/pci.rs b/src/app/pci.rs index 1183fff..7e00368 100644 --- a/src/app/pci.rs +++ b/src/app/pci.rs @@ -6,7 +6,7 @@ use std::prelude::*; use std::uefi::guid; #[allow(dead_code)] -#[repr(packed)] +#[repr(C, packed)] struct Rsdp { signature: [u8; 8], // b"RSD PTR " chksum: u8, @@ -21,7 +21,7 @@ struct Rsdp { } #[allow(dead_code)] -#[repr(packed)] +#[repr(C, packed)] struct SdtHeader { signature: [u8; 4], length: u32, diff --git a/src/display.rs b/src/display.rs index a9cad27..969ce37 100644 --- a/src/display.rs +++ b/src/display.rs @@ -137,7 +137,7 @@ impl<'a> ScaledDisplay<'a> { } } -impl<'a> Renderer for ScaledDisplay<'a> { +impl Renderer for ScaledDisplay<'_> { fn width(&self) -> u32 { self.display.width() / self.scale } diff --git a/src/image/mod.rs b/src/image/mod.rs index b3ea301..c7d0cf4 100644 --- a/src/image/mod.rs +++ b/src/image/mod.rs @@ -17,7 +17,7 @@ pub struct ImageRoi<'a> { image: &'a Image, } -impl<'a> ImageRoi<'a> { +impl ImageRoi<'_> { /// Draw the ROI on a window pub fn draw(&self, renderer: &mut R, x: i32, mut y: i32) { let stride = self.image.w;