icrate: Re-add out-parameters

madsmtm · Feb 1, 2023 · 284ade9 · 284ade9
1 parent 21b2952
commit 284ade9
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 22 deletions.
diff --git a/crates/header-translator/src/rust_type.rs b/crates/header-translator/src/rust_type.rs
@@ -1722,27 +1722,27 @@ impl fmt::Display for Ty {
                     is_const: false,
                     pointee,
                 } => match &**pointee {
-                    // TODO: Re-enable once we can support it
-                    // Inner::Id {
-                    //     ty,
-                    //     is_const: false,
-                    //     lifetime: Lifetime::Autoreleasing,
-                    //     nullability: inner_nullability,
-                    // } if self.kind == TyKind::MethodArgument => {
-                    //     let tokens = if *inner_nullability == Nullability::NonNull {
-                    //         format!("Id<{ty}, Shared>")
-                    //     } else {
-                    //         format!("Option<Id<{ty}, Shared>>")
-                    //     };
-                    //     if *nullability == Nullability::NonNull {
-                    //         write!(f, "&mut {tokens}")
-                    //     } else {
-                    //         write!(f, "Option<&mut {tokens}>")
-                    //     }
-                    // }
-                    // Inner::Id { .. } => {
-                    //     unreachable!("there should be no id with other values: {self:?}")
-                    // }
+                    Inner::Id {
+                        ty,
+                        // Don't care about the const-ness of the id.
+                        is_const: _,
+                        lifetime: Lifetime::Autoreleasing,
+                        nullability: inner_nullability,
+                    } if self.kind == TyKind::MethodArgument => {
+                        let tokens = if *inner_nullability == Nullability::NonNull {
+                            format!("Id<{ty}, Shared>")
+                        } else {
+                            format!("Option<Id<{ty}, Shared>>")
+                        };
+                        if *nullability == Nullability::NonNull {
+                            write!(f, "&mut {tokens}")
+                        } else {
+                            write!(f, "Option<&mut {tokens}>")
+                        }
+                    }
+                    Inner::Id { .. } if self.kind == TyKind::MethodArgument => {
+                        unreachable!("invalid out-pointer id {self:?}")
+                    }
                     block @ Inner::Block { .. } => {
                         if *nullability == Nullability::NonNull {
                             write!(f, "&{block}")

diff --git a/crates/icrate/CHANGELOG.md b/crates/icrate/CHANGELOG.md
@@ -88,6 +88,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Removed a few instances of `TodoProtocols`.
 * Fixed type-encoding of a few `struct`s.
 * Fixed `NSProxy` trait methods.
+* **BREAKING**: Fixed type in methods that worked with out-parameters.
 
 
 ## icrate 0.0.1 - 2022-12-24

diff --git a/crates/icrate/src/generated b/crates/icrate/src/generated