diff --git a/crates/header-translator/src/rust_type.rs b/crates/header-translator/src/rust_type.rs index abc5ce841..22ff2db97 100644 --- a/crates/header-translator/src/rust_type.rs +++ b/crates/header-translator/src/rust_type.rs @@ -1419,7 +1419,14 @@ impl Ty { [decl] if decl.id.is_nsobject() => write!(f, "NSObject"), [decl] => write!(f, "ProtocolObject", decl.id.path()), // TODO: Handle this better - _ => write!(f, "TodoProtocols"), + [first, rest @ ..] => { + write!(f, "AnyObject /* {}", first.id.path())?; + for protocol in rest { + write!(f, "+ {}", protocol.id.path())?; + } + write!(f, " */")?; + Ok(()) + } }, Self::AnyProtocol => write!(f, "AnyProtocol"), Self::AnyClass { protocols } => match &**protocols { @@ -1431,7 +1438,8 @@ impl Ty { Self::TypeDef { id, .. } => { write!(f, "{}", id.path()) } - Self::Fn { .. } => write!(f, "TodoFunction"), + // TODO: Handle this better. + Self::Fn { .. } => write!(f, "core::ffi::c_void /* TODO: Should be a function. */"), Self::Block { sendable: _, no_escape, diff --git a/crates/objc2/src/__framework_prelude.rs b/crates/objc2/src/__framework_prelude.rs index 3a31215bf..a5b2f4ca0 100644 --- a/crates/objc2/src/__framework_prelude.rs +++ b/crates/objc2/src/__framework_prelude.rs @@ -20,6 +20,3 @@ pub use crate::{ extern_category, extern_class, extern_methods, extern_protocol, ClassType, MainThreadMarker, MainThreadOnly, Message, ProtocolType, }; - -pub type TodoFunction = *const c_void; -pub type TodoProtocols = AnyObject; diff --git a/generated b/generated index 2a180bb57..0d2614a81 160000 --- a/generated +++ b/generated @@ -1 +1 @@ -Subproject commit 2a180bb57d3d57ea28e95ff60187dcf5750cc5eb +Subproject commit 0d2614a812f361ef0b65e2158b32900c699c0ea0