Merge pull request #498 from silvanshade/example-refactoring-once-cell

Refactor browser and metal examples to use OnceCell
madsmtm · Sep 3, 2023 · 7e58561 · 7e58561
2 parents c4dfb53 + f9db7ee
commit 7e58561
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 22 deletions.
diff --git a/crates/icrate/examples/browser.rs b/crates/icrate/examples/browser.rs
@@ -1,5 +1,5 @@
 #![deny(unsafe_op_in_unsafe_fn)]
-use core::{cell::RefCell, ptr::NonNull};
+use core::{cell::OnceCell, ptr::NonNull};
 
 use icrate::{
     AppKit::{
@@ -26,20 +26,29 @@ use objc2::{
     sel, ClassType,
 };
 
-type IdCell<T> = Box<RefCell<Option<Id<T>>>>;
+type IdCell<T> = Box<OnceCell<Id<T>>>;
 
 macro_rules! idcell {
+    ($name:ident => $this:expr) => {
+        $this.$name.set($name).expect(&format!(
+            "ivar should not already be initialized: `{}`",
+            stringify!($name)
+        ));
+    };
     ($name:ident <= $this:expr) => {
-        let $name = $this.$name.borrow();
-        let $name = $name
-            .as_ref()
-            .expect(concat!(stringify!($name), " ivar should be initialized"));
+        #[rustfmt::skip]
+        let Some($name) = $this.$name.get() else {
+            unreachable!(
+                "ivar should be initialized: `{}`",
+                stringify!($name)
+            )
+        };
     };
 }
 
 declare_class!(
     struct Delegate {
-        text_field: IvarDrop<IdCell<NSTextField>, "_text_field">,
+        nav_url: IvarDrop<IdCell<NSTextField>, "_nav_url">,
         web_view: IvarDrop<IdCell<WKWebView>, "_web_view">,
         window: IvarDrop<IdCell<NSWindow>, "_window">,
     }
@@ -56,7 +65,7 @@ declare_class!(
         unsafe fn init(this: *mut Self) -> Option<NonNull<Self>> {
             let this: Option<&mut Self> = msg_send![super(this), init];
             this.map(|this| {
-                Ivar::write(&mut this.text_field, IdCell::default());
+                Ivar::write(&mut this.nav_url, IdCell::default());
                 Ivar::write(&mut this.web_view, IdCell::default());
                 Ivar::write(&mut this.window, IdCell::default());
                 NonNull::from(this)
@@ -232,9 +241,9 @@ declare_class!(
                 web_view.loadRequest(&request);
             }
 
-            self.text_field.replace(Some(nav_url));
-            self.web_view.replace(Some(web_view));
-            self.window.replace(Some(window));
+            idcell!(nav_url => self);
+            idcell!(web_view => self);
+            idcell!(window => self);
         }
     }
 
@@ -268,10 +277,10 @@ declare_class!(
             web_view: &WKWebView,
             _navigation: Option<&WKNavigation>,
         ) {
-            idcell!(text_field <= self);
+            idcell!(nav_url <= self);
             unsafe {
                 if let Some(url) = web_view.URL().and_then(|url| url.absoluteString()) {
-                    text_field.setStringValue(&url);
+                    nav_url.setStringValue(&url);
                 }
             }
         }

diff --git a/crates/icrate/examples/metal.rs b/crates/icrate/examples/metal.rs
@@ -1,6 +1,6 @@
 #![deny(unsafe_op_in_unsafe_fn)]
 
-use core::{cell::RefCell, ptr::NonNull};
+use core::{cell::OnceCell, ptr::NonNull};
 
 use icrate::{
     AppKit::{
@@ -101,14 +101,23 @@ pub struct Color {
     pub b: f32,
 }
 
-type IdCell<T> = Box<RefCell<Option<Id<T>>>>;
+type IdCell<T> = Box<OnceCell<Id<T>>>;
 
 macro_rules! idcell {
+    ($name:ident => $this:expr) => {
+        $this.$name.set($name).expect(&format!(
+            "ivar should not already be initialized: `{}`",
+            stringify!($name)
+        ));
+    };
     ($name:ident <= $this:expr) => {
-        let $name = $this.$name.borrow();
-        let $name = $name
-            .as_ref()
-            .expect(concat!(stringify!($name), " ivar should be initialized"));
+        #[rustfmt::skip]
+        let Some($name) = $this.$name.get() else {
+            unreachable!(
+                "ivar should be initialized: `{}`",
+                stringify!($name)
+            )
+        };
     };
 }
 
@@ -229,9 +238,9 @@ declare_class!(
             window.makeKeyAndOrderFront(None);
 
             // initialize the delegate state
-            self.command_queue.replace(Some(command_queue));
-            self.pipeline_state.replace(Some(pipeline_state));
-            self.window.replace(Some(window));
+            idcell!(command_queue => self);
+            idcell!(pipeline_state => self);
+            idcell!(window => self);
         }
     }