From aaad8450e990f74c6b398aca9a6ec495720bf845 Mon Sep 17 00:00:00 2001
From: Dario Nieuwenhuis <dirbaio@dirbaio.net>
Date: Sun, 24 Nov 2024 20:58:48 +0100
Subject: Use inline const for initializing arrays. (#3567)

---
 embassy-time/src/driver_std.rs  | 4 ++--
 embassy-time/src/driver_wasm.rs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'embassy-time')

diff --git a/embassy-time/src/driver_std.rs b/embassy-time/src/driver_std.rs
index d182f8331..cbef7aae1 100644
--- a/embassy-time/src/driver_std.rs
+++ b/embassy-time/src/driver_std.rs
@@ -43,7 +43,6 @@ struct TimeDriver {
     signaler: UninitCell<Signaler>,
 }
 
-const ALARM_NEW: AlarmState = AlarmState::new();
 embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver {
     alarm_count: AtomicU8::new(0),
 
@@ -56,7 +55,8 @@ embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver {
 impl TimeDriver {
     fn init(&self) {
         self.once.call_once(|| unsafe {
-            self.alarms.write(CsMutex::new(RefCell::new([ALARM_NEW; ALARM_COUNT])));
+            self.alarms
+                .write(CsMutex::new(RefCell::new([const { AlarmState::new() }; ALARM_COUNT])));
             self.zero_instant.write(StdInstant::now());
             self.signaler.write(Signaler::new());
 
diff --git a/embassy-time/src/driver_wasm.rs b/embassy-time/src/driver_wasm.rs
index ad884f060..d65629e49 100644
--- a/embassy-time/src/driver_wasm.rs
+++ b/embassy-time/src/driver_wasm.rs
@@ -40,7 +40,6 @@ struct TimeDriver {
     zero_instant: UninitCell<StdInstant>,
 }
 
-const ALARM_NEW: AlarmState = AlarmState::new();
 embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver {
     alarm_count: AtomicU8::new(0),
     once: Once::new(),
@@ -51,7 +50,8 @@ embassy_time_driver::time_driver_impl!(static DRIVER: TimeDriver = TimeDriver {
 impl TimeDriver {
     fn init(&self) {
         self.once.call_once(|| unsafe {
-            self.alarms.write(Mutex::new([ALARM_NEW; ALARM_COUNT]));
+            self.alarms
+                .write(Mutex::new([const { AlarmState::new() }; ALARM_COUNT]));
             self.zero_instant.write(StdInstant::now());
         });
     }
-- 
cgit