Automatically generate DefaultId implementations

Author: madsmtm

crates/header-translator/src/method.rs

@@ -246,6 +246,10 @@ impl Method {
         (self.is_class, self.selector.clone())
     }
 
+    pub(crate) fn usable_in_default_id(&self) -> bool {
+        self.selector == "new" && self.is_class && self.arguments.is_empty() && self.safe
+    }
+
     fn parent_type_data(entity: &Entity<'_>, context: &Context<'_>) -> (bool, bool) {
         let parent = entity.get_semantic_parent().expect("method parent");
         let (parent, is_protocol) = match parent.get_kind() {

crates/header-translator/src/stmt.rs

@@ -1428,6 +1428,25 @@ impl fmt::Display for Stmt {
                 }
                 writeln!(f, "    }}")?;
                 writeln!(f, ");")?;
+
+                if let Some(method) = methods.iter().find(|method| method.usable_in_default_id()) {
+                    if let Some(feature) = cls.feature() {
+                        // Assume new methods require no extra features
+                        writeln!(f, "    #[cfg(feature = \"{feature}\")]")?;
+                    }
+                    writeln!(
+                        f,
+                        "impl{} DefaultId for {}{} {{",
+                        GenericParamsHelper(generics, "Message"),
+                        cls.path_in_relation_to(category),
+                        GenericTyHelper(generics),
+                    )?;
+                    writeln!(f, "    #[inline]")?;
+                    writeln!(f, "    fn default_id() -> Id<Self> {{")?;
+                    writeln!(f, "        Self::{}()", method.fn_name)?;
+                    writeln!(f, "    }}")?;
+                    writeln!(f, "}}")?;
+                }
             }
             Self::ProtocolImpl {
                 cls,

crates/icrate/CHANGELOG.md

@@ -43,6 +43,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * **BREAKING**: Removed ownership parameter from generic types, since the
   ownership/mutability information is now stored in `ClassType::Mutability`.
 * **BREAKING**: Renamed `NSMutableCopying::mutable_copy` to `::mutableCopy`.
+* **BREAKING**: The default value for `NSUUID` was changed from a nil UUID to
+  a new random UUID.
 
 ### Removed
 * **BREAKING**: Removed various redundant `NSProxy` methods.

crates/icrate/src/Foundation/additions/array.rs

@@ -7,7 +7,6 @@ use core::panic::{RefUnwindSafe, UnwindSafe};
 
 use objc2::msg_send;
 use objc2::mutability::{IsMutable, IsRetainable};
-use objc2::rc::DefaultId;
 
 use super::util;
 use crate::common::*;
@@ -234,13 +233,6 @@ impl<T: IsMutable> IndexMut<usize> for NSArray<T> {
     }
 }
 
-impl<T: Message> DefaultId for NSArray<T> {
-    #[inline]
-    fn default_id() -> Id<Self> {
-        Self::new()
-    }
-}
-
 impl<T: fmt::Debug + Message> fmt::Debug for NSArray<T> {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

crates/icrate/src/Foundation/additions/attributed_string.rs

@@ -2,7 +2,6 @@
 use core::panic::{RefUnwindSafe, UnwindSafe};
 
 use objc2::extern_methods;
-use objc2::rc::DefaultId;
 
 use crate::common::*;
 use crate::Foundation::{self, NSAttributedString, NSAttributedStringKey};
@@ -45,10 +44,3 @@ extern_methods!(
         }
     }
 );
-
-impl DefaultId for NSAttributedString {
-    #[inline]
-    fn default_id() -> Id<Self> {
-        Self::new()
-    }
-}

crates/icrate/src/Foundation/additions/data.rs

@@ -6,8 +6,6 @@ use core::ops::Index;
 use core::panic::{RefUnwindSafe, UnwindSafe};
 use core::slice::{self, SliceIndex};
 
-use objc2::rc::DefaultId;
-
 use crate::common::*;
 use crate::Foundation::{self, NSData};
 
@@ -85,13 +83,6 @@ impl<I: SliceIndex<[u8]>> Index<I> for NSData {
     }
 }
 
-impl DefaultId for NSData {
-    #[inline]
-    fn default_id() -> Id<Self> {
-        Self::new()
-    }
-}
-
 impl fmt::Debug for NSData {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

crates/icrate/src/Foundation/additions/dictionary.rs

@@ -9,7 +9,6 @@ use core::ptr::{self, NonNull};
 
 use objc2::msg_send;
 use objc2::mutability::IsMutable;
-use objc2::rc::DefaultId;
 use objc2::runtime::Object;
 
 use super::util;
@@ -211,13 +210,6 @@ extern_methods!(
     }
 );
 
-impl<K: Message, V: Message> DefaultId for NSDictionary<K, V> {
-    #[inline]
-    fn default_id() -> Id<Self> {
-        Self::new()
-    }
-}
-
 unsafe impl<K: Message, V: Message> Foundation::NSFastEnumeration2 for NSDictionary<K, V> {
     type Item = K;
 }

crates/icrate/src/Foundation/additions/mutable_array.rs

@@ -4,7 +4,6 @@ use core::cmp::Ordering;
 use core::ops::{Index, IndexMut};
 
 use objc2::mutability::{IsMutable, IsRetainable};
-use objc2::rc::DefaultId;
 
 use super::util;
 use crate::common::*;
@@ -175,10 +174,3 @@ impl<T: IsMutable> IndexMut<usize> for NSMutableArray<T> {
         self.get_mut(index).unwrap()
     }
 }
-
-impl<T: Message> DefaultId for NSMutableArray<T> {
-    #[inline]
-    fn default_id() -> Id<Self> {
-        Self::new()
-    }
-}

crates/icrate/src/Foundation/additions/mutable_attributed_string.rs

@@ -1,6 +1,4 @@
 #![cfg(feature = "Foundation_NSMutableAttributedString")]
-use objc2::rc::DefaultId;
-
 use crate::common::*;
 use crate::Foundation::{self, NSAttributedString, NSMutableAttributedString};
 
@@ -19,10 +17,3 @@ impl NSMutableAttributedString {
         Self::initWithAttributedString(Self::alloc(), attributed_string)
     }
 }
-
-impl DefaultId for NSMutableAttributedString {
-    #[inline]
-    fn default_id() -> Id<Self> {
-        Self::new()
-    }
-}

crates/icrate/src/Foundation/additions/mutable_data.rs

@@ -5,8 +5,6 @@ use core::ops::{Index, IndexMut, Range};
 use core::slice::{self, SliceIndex};
 use std::io;
 
-use objc2::rc::DefaultId;
-
 use crate::common::*;
 use crate::Foundation::{NSMutableData, NSRange};
 
@@ -136,13 +134,6 @@ impl io::Write for NSMutableData {
     }
 }
 
-impl DefaultId for NSMutableData {
-    #[inline]
-    fn default_id() -> Id<Self> {
-        Self::new()
-    }
-}
-
 impl<'a> IntoIterator for &'a NSMutableData {
     type Item = &'a u8;
     type IntoIter = core::slice::Iter<'a, u8>;