Merge pull request #1663 from fox0/system2

uefi: `system::with_*` now take mutably closure

Author: phip1611

uefi/CHANGELOG.md

@@ -6,6 +6,8 @@
 ## Changed
 - **Breaking:** `boot::stall` now take `core::time::Duration` instead of `usize`.
 - `table::cfg::*_GUID` constants now deprecated. Use `ConfigTableEntry::*_GUID` instead.
+- `system::with_config_table`, `system::with_stdin`, `system::with_stdout` and `system::with_stderr`
+  now take mutably closure.
 
 
 # uefi - 0.35.0 (2025-05-04)

uefi/src/system.rs

@@ -68,9 +68,9 @@ pub fn uefi_revision() -> Revision {
 ///     }
 /// });
 /// ```
-pub fn with_config_table<F, R>(f: F) -> R
+pub fn with_config_table<F, R>(mut f: F) -> R
 where
-    F: Fn(&[ConfigTableEntry]) -> R,
+    F: FnMut(&[ConfigTableEntry]) -> R,
 {
     let st = table::system_table_raw_panicking();
     // SAFETY: valid per requirements of `set_system_table`.
@@ -83,6 +83,7 @@ where
     } else {
         unsafe { slice::from_raw_parts(ptr, len) }
     };
+
     f(slice)
 }
 
@@ -92,9 +93,9 @@ where
 ///
 /// This function will panic if called after exiting boot services, or if stdin
 /// is not available.
-pub fn with_stdin<F, R>(f: F) -> R
+pub fn with_stdin<F, R>(mut f: F) -> R
 where
-    F: Fn(&mut Input) -> R,
+    F: FnMut(&mut Input) -> R,
 {
     let st = table::system_table_raw_panicking();
     // SAFETY: valid per requirements of `set_system_table`.
@@ -118,9 +119,9 @@ where
 ///
 /// This function will panic if called after exiting boot services, or if stdout
 /// is not available.
-pub fn with_stdout<F, R>(f: F) -> R
+pub fn with_stdout<F, R>(mut f: F) -> R
 where
-    F: Fn(&mut Output) -> R,
+    F: FnMut(&mut Output) -> R,
 {
     let st = table::system_table_raw_panicking();
     // SAFETY: valid per requirements of `set_system_table`.
@@ -144,9 +145,9 @@ where
 ///
 /// This function will panic if called after exiting boot services, or if stderr
 /// is not available.
-pub fn with_stderr<F, R>(f: F) -> R
+pub fn with_stderr<F, R>(mut f: F) -> R
 where
-    F: Fn(&mut Output) -> R,
+    F: FnMut(&mut Output) -> R,
 {
     let st = table::system_table_raw_panicking();
     // SAFETY: valid per requirements of `set_system_table`.
@@ -163,3 +164,28 @@ where
 
     f(stderr)
 }
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[allow(dead_code)]
+    #[allow(clippy::assertions_on_constants)]
+    fn with_config_table_compile_test() {
+        assert!(false, "compile test only");
+
+        let mut acpi2_address = None;
+
+        with_config_table(|slice| {
+            for i in slice {
+                match i.guid {
+                    ConfigTableEntry::ACPI2_GUID => {
+                        acpi2_address = Some(i.address);
+                        break;
+                    }
+                    _ => {}
+                }
+            }
+        });
+    }
+}