From 0142f069684444c944fcb41cf600c3d7db8922c0 Mon Sep 17 00:00:00 2001 From: Steven Malis Date: Mon, 10 Aug 2026 13:01:41 -0400 Subject: [PATCH 1/2] Update bitfield-struct and fix clippy warnings --- Cargo.toml | 2 +- igvm/src/lib.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 8dceac6..bf61a10 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,7 +13,7 @@ igvm_defs = { path = "igvm_defs", version = "0.4.0" } igvm = { path = "igvm", version = "0.4.0" } anyhow = "1.0" -bitfield-struct = "0.12" +bitfield-struct = "0.13" corim = { version = "0.1.2", default-features = false } crc32fast = { version = "1.3.2", default-features = false } hex = { version = "0.4", default-features = false } diff --git a/igvm/src/lib.rs b/igvm/src/lib.rs index 0adcc47..9fee3a6 100644 --- a/igvm/src/lib.rs +++ b/igvm/src/lib.rs @@ -147,7 +147,7 @@ fn append_header( variable_headers.extend_from_slice(header); variable_headers.extend(align_up_iter); - debug_assert!(variable_headers.len() % 8 == 0); + debug_assert!(variable_headers.len().is_multiple_of(8)); } /// The serializer for headers with file data. This serializer deduplicates data @@ -1976,7 +1976,7 @@ impl IgvmDirectiveHeader { return Err(BinaryHeaderError::UnalignedAddress(*gpa)); } - if (*number_of_bytes as u64) % PAGE_SIZE_4K != 0 { + if !(*number_of_bytes as u64).is_multiple_of(PAGE_SIZE_4K) { return Err(BinaryHeaderError::UnalignedSize(*number_of_bytes as u64)); } } @@ -2605,7 +2605,7 @@ impl IgvmRelocatableRegion { let start = relocation_base; let end = relocation_base + self.size; - if start % self.relocation_alignment != 0 { + if !start.is_multiple_of(self.relocation_alignment) { tracing::debug!("base is not aligned"); false } else if start < self.minimum_relocation_gpa { From 86fbfa42e3517c86587cdfc866ed8bee8473e116 Mon Sep 17 00:00:00 2001 From: Steven Malis Date: Mon, 10 Aug 2026 13:04:37 -0400 Subject: [PATCH 2/2] undo clippy due to msrv --- igvm/src/lib.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/igvm/src/lib.rs b/igvm/src/lib.rs index 9fee3a6..0adcc47 100644 --- a/igvm/src/lib.rs +++ b/igvm/src/lib.rs @@ -147,7 +147,7 @@ fn append_header( variable_headers.extend_from_slice(header); variable_headers.extend(align_up_iter); - debug_assert!(variable_headers.len().is_multiple_of(8)); + debug_assert!(variable_headers.len() % 8 == 0); } /// The serializer for headers with file data. This serializer deduplicates data @@ -1976,7 +1976,7 @@ impl IgvmDirectiveHeader { return Err(BinaryHeaderError::UnalignedAddress(*gpa)); } - if !(*number_of_bytes as u64).is_multiple_of(PAGE_SIZE_4K) { + if (*number_of_bytes as u64) % PAGE_SIZE_4K != 0 { return Err(BinaryHeaderError::UnalignedSize(*number_of_bytes as u64)); } } @@ -2605,7 +2605,7 @@ impl IgvmRelocatableRegion { let start = relocation_base; let end = relocation_base + self.size; - if !start.is_multiple_of(self.relocation_alignment) { + if start % self.relocation_alignment != 0 { tracing::debug!("base is not aligned"); false } else if start < self.minimum_relocation_gpa {