Merge pull request #1871 from rust-osdev/bishop-msrv-188

Bump MSRV to 1.88

Author: phip1611

Cargo.toml

@@ -17,7 +17,7 @@ edition = "2024"
 keywords = ["uefi", "efi"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-osdev/uefi-rs"
-rust-version = "1.85.1"
+rust-version = "1.88"
 
 [workspace.dependencies]
 bitflags = "2.0.0"

uefi/CHANGELOG.md

@@ -22,6 +22,7 @@
   Option.
 - **Breaking:** `boot::check_event` now consumes `&Event` rather than `Event`, removing the
   need for unnecessary `Event::unsafe_clone()`s.
+- MSRV increased to 1.88.
 
 # uefi - v0.36.1 (2025-11-05)
 

uefi/src/allocator.rs

@@ -87,7 +87,7 @@ fn alloc_pool_aligned(memory_type: MemoryType, size: usize, align: usize) -> *mu
 ///
 /// [Rust type layout]: https://doc.rust-lang.org/reference/type-layout.html
 const fn layout_allows_page_alloc_shortcut(layout: &Layout) -> bool {
-    layout.size() % PAGE_SIZE == 0 && layout.align() == PAGE_SIZE
+    layout.size().is_multiple_of(PAGE_SIZE) && layout.align() == PAGE_SIZE
 }
 
 /// Allocator using UEFI boot services.

uefi/src/data_types/owned_strs.rs

@@ -101,13 +101,13 @@ impl CString16 {
 
     /// Returns the number of characters without the trailing null character.
     #[must_use]
-    pub fn num_chars(&self) -> usize {
+    pub const fn num_chars(&self) -> usize {
         self.0.len() - 1
     }
 
     /// Returns if the string is empty. This ignores the null character.
     #[must_use]
-    pub fn is_empty(&self) -> bool {
+    pub const fn is_empty(&self) -> bool {
         self.num_chars() == 0
     }
 }

uefi/src/mem/aligned_buffer.rs

@@ -100,7 +100,7 @@ impl AlignedBuffer {
     /// Check the buffer's alignment against the `required_alignment`.
     pub fn check_alignment(&self, required_alignment: usize) -> Result<(), AlignmentError> {
         //TODO: use bfr.addr() when it's available
-        if (self.ptr() as usize) % required_alignment != 0 {
+        if !(self.ptr() as usize).is_multiple_of(required_alignment) {
             return Err(AlignmentError); //TODO: use >is_aligned_to< when it's available
         }
         Ok(())

uefi/src/proto/hii/config_str.rs

@@ -183,7 +183,7 @@ impl ConfigurationString {
     /// An `Option<String>` containing the parsed string.
     #[must_use]
     pub fn parse_string_from_hex(data: &str) -> Option<String> {
-        if data.len() % 2 != 0 {
+        if !data.len().is_multiple_of(2) {
             return None;
         }
         let size_bytes = data.len() / 2 + 2; // includes \0 terminator

uefi/src/proto/loaded_image.rs

@@ -75,8 +75,8 @@ impl LoadedImage {
 
         if self.0.load_options.is_null() {
             Err(LoadOptionsError::NotSet)
-        } else if (load_options_size % size_of::<u16>() != 0)
-            || (((self.0.load_options as usize) % align_of::<u16>()) != 0)
+        } else if !load_options_size.is_multiple_of(size_of::<u16>())
+            || !(self.0.load_options as usize).is_multiple_of(align_of::<u16>())
         {
             Err(LoadOptionsError::NotAligned)
         } else {

uefi/src/runtime.rs

@@ -291,11 +291,11 @@ impl Iterator for VariableKeys {
 
         // If the name buffer was too small, resize it to be big enough and call
         // `get_next_variable_key` again.
-        if let Err(err) = &result {
-            if let Some(required_size) = err.data() {
-                self.name.resize(*required_size, 0u16);
-                result = get_next_variable_key(&mut self.name, &mut self.vendor);
-            }
+        if let Err(err) = &result
+            && let Some(required_size) = err.data()
+        {
+            self.name.resize(*required_size, 0u16);
+            result = get_next_variable_key(&mut self.name, &mut self.vendor);
         }
 
         match result {