Allow &'static AnyClass in function return

Also delegate to `fn_return` in `method_return`.

crates/header-translator/src/rust_type.rs

@@ -1454,54 +1454,34 @@ impl Ty {
     }
 
     pub(crate) fn method_return(&self) -> impl fmt::Display + '_ {
-        FormatterFn(move |f| {
-            if let Self::Primitive(Primitive::Void) = self {
-                // Don't output anything
-                return Ok(());
-            }
-
-            write!(f, " -> ")?;
-
-            match self {
-                Self::Pointer {
-                    nullability,
-                    pointee,
-                    ..
-                } if pointee.is_static_object() => {
-                    if *nullability == Nullability::NonNull {
-                        write!(f, "&'static {}", pointee.behind_pointer())
-                    } else {
-                        write!(f, "Option<&'static {}>", pointee.behind_pointer())
-                    }
-                }
-                Self::Pointer {
-                    nullability,
-                    lifetime: Lifetime::Unspecified,
-                    pointee,
-                    ..
-                } if pointee.is_object_like() => {
-                    if *nullability == Nullability::NonNull {
-                        write!(f, "Retained<{}>", pointee.behind_pointer())
-                    } else {
-                        write!(f, "Option<Retained<{}>>", pointee.behind_pointer())
-                    }
-                }
-                Self::TypeDef {
-                    id, nullability, ..
-                } if self.is_object_like() => {
-                    if *nullability == Nullability::NonNull {
-                        write!(f, "Retained<{}>", id.path())
-                    } else {
-                        write!(f, "Option<Retained<{}>>", id.path())
-                    }
+        FormatterFn(move |f| match self {
+            Self::Pointer {
+                nullability,
+                lifetime: Lifetime::Unspecified,
+                pointee,
+                ..
+            } if pointee.is_object_like() && !pointee.is_static_object() => {
+                if *nullability == Nullability::NonNull {
+                    write!(f, " -> Retained<{}>", pointee.behind_pointer())
+                } else {
+                    write!(f, " -> Option<Retained<{}>>", pointee.behind_pointer())
                 }
-                Self::Primitive(Primitive::C99Bool) => {
-                    warn!("C99's bool as Objective-C method return is ill supported");
-                    write!(f, "bool")
+            }
+            Self::TypeDef {
+                id, nullability, ..
+            } if self.is_object_like() && !self.is_static_object() => {
+                if *nullability == Nullability::NonNull {
+                    write!(f, " -> Retained<{}>", id.path())
+                } else {
+                    write!(f, " -> Option<Retained<{}>>", id.path())
                 }
-                Self::Primitive(Primitive::ObjcBool) => write!(f, "bool"),
-                _ => write!(f, "{}", self.plain()),
             }
+            Self::Primitive(Primitive::C99Bool) => {
+                warn!("C99's bool as Objective-C method return is ill supported");
+                write!(f, " -> bool")
+            }
+            Self::Primitive(Primitive::ObjcBool) => write!(f, " -> bool"),
+            _ => write!(f, "{}", self.fn_return()),
         })
     }
 
@@ -1573,7 +1553,20 @@ impl Ty {
                 return Ok(());
             }
 
-            write!(f, " -> {}", self.plain())
+            match self {
+                Self::Pointer {
+                    nullability,
+                    pointee,
+                    ..
+                } if pointee.is_static_object() => {
+                    if *nullability == Nullability::NonNull {
+                        write!(f, " -> &'static {}", pointee.behind_pointer())
+                    } else {
+                        write!(f, " -> Option<&'static {}>", pointee.behind_pointer())
+                    }
+                }
+                _ => write!(f, " -> {}", self.plain()),
+            }
         })
     }
 

crates/objc2/src/topics/about_generated/CHANGELOG.md

@@ -134,10 +134,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   - A bunch of things in `WebKit`.
 * **BREAKING**: Marked methods on the `NSObjectUIAccessibility` category as
   `MainThreadOnly`.
-* Fixed `AnyClass` and `AnyProtocol` mapping. For example
+* **BREAKING**: Fixed `AnyClass` and `AnyProtocol` mapping. For example
   `NSStringFromProtocol` now takes `&AnyProtocol`,
   `NSPasteboard::readObjectsForClasses_options` now takes
   `&NSArray<AnyClass>`, and `UITrait` is now exposed more correctly.
+* **BREAKING**: Fixed the return type of `NSClassFromString`.
 
 
 ## 0.2.2 - 2024-05-21