1 files changed, 5 insertions, 23 deletions

diff --git a/embassy/src/util/forever.rs b/embassy/src/util/forever.rs
index ba3c66a91..3d2af38b1 100644
--- a/embassy/src/util/forever.rs
+++ b/embassy/src/util/forever.rs
@@ -52,20 +52,7 @@ impl<T> Forever<T> {
     #[inline(always)]
     #[allow(clippy::mut_from_ref)]
     pub fn put(&'static self, val: T) -> &'static mut T {
-        if self
-            .used
-            .compare_exchange(false, true, Ordering::Relaxed, Ordering::Relaxed)
-            .is_err()
-        {
-            panic!("Forever::put() called multiple times");
-        }
-
-        unsafe {
-            let p = self.t.get();
-            let p = (&mut *p).as_mut_ptr();
-            p.write(val);
-            &mut *p
-        }
+        self.put_with(|| val)
     }
 
     /// Store the closure return value in this `Forever`, returning a mutable reference to it.
@@ -87,12 +74,8 @@ impl<T> Forever<T> {
             panic!("Forever.put() called multiple times");
         }
 
-        unsafe {
-            let p = self.t.get();
-            let p = (&mut *p).as_mut_ptr();
-            p.write(val());
-            &mut *p
-        }
+        let p: &'static mut MaybeUninit<T> = unsafe { &mut *self.t.get() };
+        p.write(val())
     }
 
     /// Unsafely get a mutable reference to the contents of this Forever.
@@ -106,8 +89,7 @@ impl<T> Forever<T> {
     #[inline(always)]
     #[allow(clippy::mut_from_ref)]
     pub unsafe fn steal(&self) -> &mut T {
-        let p = self.t.get();
-        let p = (&mut *p).as_mut_ptr();
-        &mut *p
+        let p: &mut MaybeUninit<T> = &mut *self.t.get();
+        p.assume_init_mut()
     }
 }