Merge pull request #60 from us-irs/fix-keyword-order

Author: jonathanpallant

CHANGELOG.md

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Keyword order for arrays of inner fields when used with with `const_inner`.
+
+### Added
+
+- Missing `const` for unchecked inner MMIO block getter when using `const_inner`.
+
 ## [v0.6.0] - 2025-07-11
 
 ### Changed

macro/src/lib.rs

@@ -457,7 +457,7 @@ impl FieldParser {
             #[doc = "based on a raw pointer which might lead to undefined behaviour on invalid offsets."]
             #[doc = "Users MUST ensure that the offset is valid."]
             #[inline]
-            pub unsafe fn #field_ident_unchecked(&mut self, index: usize) -> #inner_mmio_path<'_> {
+            pub #const_token unsafe fn #field_ident_unchecked(&mut self, index: usize) -> #inner_mmio_path<'_> {
                 unsafe {
                     self.#steal_func_name_unchecked(index)
                 }
@@ -505,7 +505,7 @@ impl FieldParser {
             #[doc = "based on a raw pointer which might lead to undefined behaviour on invalid offsets."]
             #[doc = "Users MUST ensure that the offset is valid."]
             #[inline]
-            pub unsafe #const_token fn #field_ident_shared_unchecked(&self, index: usize) -> derive_mmio::SharedInner<#inner_mmio_path<'_>> {
+            pub #const_token unsafe fn #field_ident_shared_unchecked(&self, index: usize) -> derive_mmio::SharedInner<#inner_mmio_path<'_>> {
                 derive_mmio::SharedInner::__new_internal(
                     unsafe {
                         self.#private_steal_unchecked_func_name(index)

tests/constness.rs

@@ -14,6 +14,8 @@ struct Uart {
     control: u32,
     #[mmio(Inner)]
     bank_0: UartBank,
+    #[mmio(Inner)]
+    multi_banks: [UartBank; 2],
 }
 
 pub struct UartDriver {
@@ -37,6 +39,14 @@ impl UartDriver {
         self.regs.bank_0_shared()
     }
 
+    pub const fn const_bank_1_shared(&mut self) -> MmioUartBank<'_> {
+        unsafe { self.regs.multi_banks_unchecked(0) }
+    }
+
+    pub const fn const_steal_bank_2_shared(&mut self) -> MmioUartBank<'static> {
+        unsafe { self.regs.steal_multi_banks_unchecked(1) }
+    }
+
     pub const fn const_steal_bank_0_shared(
         &mut self,
     ) -> derive_mmio::SharedInner<MmioUartBank<'static>> {