Properly emit protocol objects with multiple protocols

madsmtm · Nov 25, 2024 · 63d42bf · 63d42bf
1 parent 87dcf25
commit 63d42bf
Showing 1 changed file with 11 additions and 7 deletions.
diff --git a/crates/header-translator/src/rust_type.rs b/crates/header-translator/src/rust_type.rs
@@ -1416,14 +1416,18 @@ impl Ty {
             Self::GenericParam { name } => write!(f, "{name}"),
             Self::AnyObject { protocols } => match &**protocols {
                 [] => write!(f, "AnyObject"),
-                [decl] => write!(f, "ProtocolObject<dyn {}>", decl.id.path()),
-                // TODO: Handle this better
-                [first, rest @ ..] => {
-                    write!(f, "AnyObject /* {}", first.id.path())?;
-                    for protocol in rest {
-                        write!(f, "+ {}", protocol.id.path())?;
+                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, " */")?;
+
+                    write!(f, ">")?;
                     Ok(())
                 }
             },