Use impl instead of ProtocolObject where possible

Author: madsmtm

crates/header-translator/src/rust_type.rs

@@ -1758,6 +1758,26 @@ impl fmt::Display for Ty {
                 ty => write!(f, "{ty}"),
             },
             TyKind::MethodArgument | TyKind::FnArgument => match &self.ty {
+                Inner::Id {
+                    ty: IdType::AnyObject { protocols },
+                    is_const: false,
+                    lifetime: Lifetime::Unspecified | Lifetime::Strong,
+                    nullability,
+                } if self.kind == TyKind::MethodArgument && !protocols.is_empty() => {
+                    if *nullability != Nullability::NonNull {
+                        write!(f, "Option<")?;
+                    }
+                    write!(f, "&")?;
+                    write!(f, "(impl ")?;
+                    for protocol in protocols {
+                        write!(f, "{} + ", protocol.path())?;
+                    }
+                    write!(f, "Message)")?;
+                    if *nullability != Nullability::NonNull {
+                        write!(f, ">")?;
+                    }
+                    Ok(())
+                }
                 Inner::Id {
                     ty,
                     is_const: false,

crates/icrate/examples/browser.rs

@@ -22,7 +22,7 @@ use objc2::{
     declare_class, msg_send, msg_send_id,
     mutability::MainThreadOnly,
     rc::Id,
-    runtime::{AnyObject, ProtocolObject, Sel},
+    runtime::{AnyObject, Sel},
     sel, ClassType,
 };
 
@@ -197,12 +197,10 @@ declare_class!(
 
             unsafe {
                 // handle input from text field (on <ENTER>, load URL from text field in web view)
-                let object = ProtocolObject::from_ref(self);
-                nav_url.setDelegate(Some(object));
+                nav_url.setDelegate(Some(self));
 
                 // handle nav events from web view (on finished navigating, update text area with current URL)
-                let object = ProtocolObject::from_ref(self);
-                web_view.setNavigationDelegate(Some(object));
+                web_view.setNavigationDelegate(Some(self));
             }
 
             // create the menu with a "quit" entry
@@ -304,8 +302,7 @@ fn main() {
     let delegate = Delegate::new(mtm);
 
     // configure the application delegate
-    let object = ProtocolObject::from_ref(&*delegate);
-    app.setDelegate(Some(object));
+    app.setDelegate(Some(&*delegate));
 
     // run the app
     unsafe { app.run() };

crates/icrate/examples/delegate.rs

@@ -7,7 +7,6 @@ use icrate::Foundation::{
 };
 use objc2::declare::{Ivar, IvarBool, IvarDrop, IvarEncode};
 use objc2::rc::Id;
-use objc2::runtime::ProtocolObject;
 use objc2::{declare_class, msg_send, msg_send_id, mutability, ClassType};
 
 declare_class!(
@@ -85,8 +84,7 @@ fn main() {
     println!("{delegate:?}");
 
     // configure the application delegate
-    let object = ProtocolObject::from_ref(&*delegate);
-    app.setDelegate(Some(object));
+    app.setDelegate(Some(&delegate));
 
     // run the app
     unsafe { app.run() };

crates/icrate/examples/metal.rs

@@ -229,8 +229,7 @@ declare_class!(
 
             // configure the metal view delegate
             unsafe {
-                let object = ProtocolObject::from_ref(self);
-                mtk_view.setDelegate(Some(object));
+                mtk_view.setDelegate(Some(self));
             }
 
             // configure the window
@@ -374,8 +373,7 @@ fn main() {
     let delegate = Delegate::new(mtm);
 
     // configure the application delegate
-    let object = ProtocolObject::from_ref(&*delegate);
-    app.setDelegate(Some(object));
+    app.setDelegate(Some(&delegate));
 
     // run the app
     unsafe { app.run() };

crates/icrate/src/additions/Foundation/dictionary.rs

@@ -341,7 +341,6 @@ impl<K: Message + Eq + Hash + HasStableHash, V: Message> NSMutableDictionary<K,
             .get(key)
             .map(|old_obj| unsafe { util::mutable_collection_retain_removed_id(old_obj) });
 
-        let key = ProtocolObject::from_ref(key);
         // SAFETY: We have ownership over the value.
         unsafe { self.setObject_forKey(&value, key) };
         old_obj
@@ -372,7 +371,6 @@ impl<K: Message + Eq + Hash + HasStableHash, V: Message> NSMutableDictionary<K,
             .get(key)
             .map(|old_obj| unsafe { util::mutable_collection_retain_removed_id(old_obj) });
 
-        let key = ProtocolObject::from_ref(key);
         // SAFETY: The value is `IsRetainable`, and hence safe for the
         // collection to retain.
         unsafe { self.setObject_forKey(value, key) };

crates/icrate/src/generated

@@ -38,6 +38,5 @@ fn main() {
     let app = NSApplication::sharedApplication(mtm);
 
     let delegate = CustomObject::new(mtm);
-    let delegate = ProtocolObject::from_ref(&*delegate);
-    app.setDelegate(Some(delegate));
+    app.setDelegate(Some(&delegate));
 }