Properly emit protocol objects with multiple protocols

Author: madsmtm

crates/header-translator/src/rust_type.rs

@@ -367,10 +367,20 @@ impl fmt::Display for IdType {
             }
             Self::AnyObject { protocols } => match &**protocols {
                 [] => write!(f, "AnyObject"),
-                [id] if id.is_nsobject() => write!(f, "NSObject"),
-                [id] => write!(f, "ProtocolObject<dyn {}>", id.path()),
-                // TODO: Handle this better
-                _ => write!(f, "TodoProtocols"),
+                protocols => {
+                    write!(f, "ProtocolObject<dyn ")?;
+
+                    let mut iter = protocols.iter();
+                    let protocol = iter.next().unwrap();
+                    write!(f, "{}", protocol.path())?;
+
+                    for protocol in iter {
+                        write!(f, " + {}", protocol.path())?;
+                    }
+
+                    write!(f, ">")?;
+                    Ok(())
+                }
             },
             Self::TypeDef { id, .. } => write!(f, "{}", id.path()),
             Self::GenericParam { name } => write!(f, "{name}"),

crates/icrate/src/common.rs

@@ -36,8 +36,6 @@ pub(crate) use block2::Block;
 pub(crate) type TodoFunction = *const c_void;
 #[cfg(feature = "objective-c")]
 pub(crate) type TodoClass = AnyObject;
-#[cfg(feature = "objective-c")]
-pub(crate) type TodoProtocols = AnyObject;
 
 // MacTypes.h
 pub(crate) type Boolean = u8; // unsigned char