Update objc2 and icrate versions (#3256)

src/platform_impl/macos/app_delegate.rs

@@ -1,23 +1,20 @@
-use std::ptr::NonNull;
-
 use icrate::Foundation::NSObject;
-use objc2::declare::{IvarBool, IvarEncode};
 use objc2::rc::Id;
 use objc2::runtime::AnyObject;
-use objc2::{declare_class, msg_send, msg_send_id, mutability, ClassType};
+use objc2::{declare_class, msg_send_id, mutability, ClassType, DeclaredClass};
 
 use super::app_state::AppState;
 use super::appkit::NSApplicationActivationPolicy;
 
-declare_class!(
-    #[derive(Debug)]
-    pub(super) struct ApplicationDelegate {
-        activation_policy: IvarEncode<NSApplicationActivationPolicy, "_activation_policy">,
-        default_menu: IvarBool<"_default_menu">,
-        activate_ignoring_other_apps: IvarBool<"_activate_ignoring_other_apps">,
-    }
+#[derive(Debug)]
+pub(super) struct State {
+    activation_policy: NSApplicationActivationPolicy,
+    default_menu: bool,
+    activate_ignoring_other_apps: bool,
+}
 
-    mod ivars;
+declare_class!(
+    pub(super) struct ApplicationDelegate;
 
     unsafe impl ClassType for ApplicationDelegate {
         type Super = NSObject;
@@ -25,30 +22,18 @@ declare_class!(
         const NAME: &'static str = "WinitApplicationDelegate";
     }
 
-    unsafe impl ApplicationDelegate {
-        #[method(initWithActivationPolicy:defaultMenu:activateIgnoringOtherApps:)]
-        unsafe fn init(
-            this: *mut Self,
-            activation_policy: NSApplicationActivationPolicy,
-            default_menu: bool,
-            activate_ignoring_other_apps: bool,
-        ) -> Option<NonNull<Self>> {
-            let this: Option<&mut Self> = unsafe { msg_send![super(this), init] };
-            this.map(|this| {
-                *this.activation_policy = activation_policy;
-                *this.default_menu = default_menu;
-                *this.activate_ignoring_other_apps = activate_ignoring_other_apps;
-                NonNull::from(this)
-            })
-        }
+    impl DeclaredClass for ApplicationDelegate {
+        type Ivars = State;
+    }
 
+    unsafe impl ApplicationDelegate {
         #[method(applicationDidFinishLaunching:)]
         fn did_finish_launching(&self, _sender: Option<&AnyObject>) {
             trace_scope!("applicationDidFinishLaunching:");
             AppState::launched(
-                *self.activation_policy,
-                *self.default_menu,
-                *self.activate_ignoring_other_apps,
+                self.ivars().activation_policy,
+                self.ivars().default_menu,
+                self.ivars().activate_ignoring_other_apps,
             );
         }
 
@@ -67,13 +52,11 @@ impl ApplicationDelegate {
         default_menu: bool,
         activate_ignoring_other_apps: bool,
     ) -> Id<Self> {
-        unsafe {
-            msg_send_id![
-                Self::alloc(),
-                initWithActivationPolicy: activation_policy,
-                defaultMenu: default_menu,
-                activateIgnoringOtherApps: activate_ignoring_other_apps,
-            ]
-        }
+        let this = Self::alloc().set_ivars(State {
+            activation_policy,
+            default_menu,
+            activate_ignoring_other_apps,
+        });
+        unsafe { msg_send_id![super(this), init] }
     }
 }