Clean up imports and add to changelog.

Author: qwandor

CHANGELOG.md

@@ -8,6 +8,8 @@
   rather than relying on global symbols.
 - Added `RegisterStateRef` parameter to exception handlers to access the saved register state, and
   removed ELR and SPSR parameters.
+- `start_core` now takes an `FnOnce` rather than an `fn` and an argument. This allows arbitrary
+  context to be captured in the closure.
 
 ## 0.3.1
 

src/lib.rs

@@ -31,6 +31,7 @@ pub mod __private {
 use core::arch::asm;
 #[cfg(not(feature = "initial-pagetable"))]
 use core::arch::naked_asm;
+use core::mem::ManuallyDrop;
 pub use entry::secondary_entry;
 #[cfg(feature = "exceptions")]
 pub use exceptions::{ExceptionHandlers, RegisterState, RegisterStateRef};
@@ -46,8 +47,6 @@ pub use pagetable::{
     InitialPagetable,
 };
 
-use core::mem::ManuallyDrop;
-
 #[cfg(not(feature = "initial-pagetable"))]
 #[unsafe(naked)]
 #[unsafe(link_section = ".init")]
@@ -244,19 +243,19 @@ pub unsafe fn start_core<C: smccc::Call, F: FnOnce() + Send + 'static, const N:
 ) -> Result<(), smccc::psci::Error> {
     const {
         assert!(
-            core::mem::size_of::<StartCoreStack<F>>()
-                + 2 * core::mem::size_of::<F>()
-                + 2 * core::mem::align_of::<F>()
+            size_of::<StartCoreStack<F>>()
+                + 2 * size_of::<F>()
+                + 2 * align_of::<F>()
                 + 1024 // trampoline stack frame overhead
-                <= core::mem::size_of::<Stack<N>>(),
+                <= size_of::<Stack<N>>(),
             "the `rust_entry` closure is too big to fit in the core stack"
         );
     }
 
     let rust_entry = ManuallyDrop::new(rust_entry);
 
     let stack_start = stack.cast::<u8>();
-    let align_offfset = stack_start.align_offset(core::mem::align_of::<F>());
+    let align_offfset = stack_start.align_offset(align_of::<F>());
     let entry_ptr = stack_start
         .wrapping_add(align_offfset)
         .cast::<ManuallyDrop<F>>();