common: Initialize PeripheralMutex state with closure to ensure it's done in-place.

1 files changed, 14 insertions, 16 deletions

diff --git a/embassy-nrf/src/buffered_uarte.rs b/embassy-nrf/src/buffered_uarte.rs
index 642c30185..048c36d39 100644
--- a/embassy-nrf/src/buffered_uarte.rs
+++ b/embassy-nrf/src/buffered_uarte.rs
@@ -155,23 +155,21 @@ impl<'d, U: UarteInstance, T: TimerInstance> BufferedUarte<'d, U, T> {
         ppi_ch2.set_task(Task::from_reg(&r.tasks_stoprx));
         ppi_ch2.enable();
 
-        let initial_state = StateInner {
-            phantom: PhantomData,
-            timer,
-            _ppi_ch1: ppi_ch1,
-            _ppi_ch2: ppi_ch2,
-
-            rx: RingBuffer::new(rx_buffer),
-            rx_state: RxState::Idle,
-            rx_waker: WakerRegistration::new(),
-
-            tx: RingBuffer::new(tx_buffer),
-            tx_state: TxState::Idle,
-            tx_waker: WakerRegistration::new(),
-        };
-
         Self {
-            inner: PeripheralMutex::new_unchecked(&mut state.0, initial_state, irq),
+            inner: PeripheralMutex::new_unchecked(irq, &mut state.0, move || StateInner {
+                phantom: PhantomData,
+                timer,
+                _ppi_ch1: ppi_ch1,
+                _ppi_ch2: ppi_ch2,
+
+                rx: RingBuffer::new(rx_buffer),
+                rx_state: RxState::Idle,
+                rx_waker: WakerRegistration::new(),
+
+                tx: RingBuffer::new(tx_buffer),
+                tx_state: TxState::Idle,
+                tx_waker: WakerRegistration::new(),
+            }),
         }
     }