Add PartialEq, Eq and Hash impls for all CF-like types

By forwarding to CFType's impl.

Author: madsmtm

framework-crates/objc2-core-foundation/src/__cf_macro_helpers.rs

@@ -1,8 +1,11 @@
 pub use core::borrow::Borrow;
+pub use core::cmp::{Eq, PartialEq};
 pub use core::convert::AsRef;
 pub use core::fmt;
+pub use core::hash::{Hash, Hasher};
 pub use core::mem::transmute;
 pub use core::ops::Deref;
+pub use core::primitive::bool;
 pub use core::stringify;
 #[cfg(feature = "objc2")]
 pub use objc2::encode::{Encode, Encoding, RefEncode};

framework-crates/objc2-core-foundation/src/base.rs

@@ -122,7 +122,7 @@ impl fmt::Debug for CFType {
         }
         #[cfg(not(feature = "CFString"))]
         {
-            f.debug_struct("<CoreFoundation type>")
+            f.debug_struct("<CoreFoundation type (enable CFString feature for more info)>")
                 .finish_non_exhaustive()
         }
     }

framework-crates/objc2-core-foundation/src/cf_type.rs

@@ -40,20 +40,10 @@ macro_rules! cf_type {
             }
         }
 
-        impl $crate::__cf_macro_helpers::fmt::Debug for $ty {
-            fn fmt(
-                &self,
-                f: &mut $crate::__cf_macro_helpers::fmt::Formatter<'_>,
-            ) -> $crate::__cf_macro_helpers::fmt::Result {
-                f.debug_struct($crate::__cf_macro_helpers::stringify!($ty))
-                    .finish_non_exhaustive()
-            }
-        }
-
         // SAFETY: The type is a CoreFoundation-like type.
         unsafe impl $crate::Type for $ty {}
 
-        $crate::__cf_type_convert_cf_type!($ty);
+        $crate::__cf_type_needs_cf_base!($ty);
 
         $crate::__cf_type_superclass!($ty $(: $superclass)?);
 
@@ -68,7 +58,7 @@ macro_rules! cf_type {
 #[cfg(feature = "CFBase")]
 #[doc(hidden)]
 #[macro_export]
-macro_rules! __cf_type_convert_cf_type {
+macro_rules! __cf_type_needs_cf_base {
     ($ty:ty) => {
         // Allow converting to CFType.
 
@@ -85,13 +75,42 @@ macro_rules! __cf_type_convert_cf_type {
                 self // Through Deref of self or superclass
             }
         }
+
+        impl $crate::__cf_macro_helpers::PartialEq for $ty {
+            #[inline]
+            fn eq(&self, other: &Self) -> $crate::__cf_macro_helpers::bool {
+                let this: &$crate::CFType = self; // Through Deref
+                let other: &$crate::CFType = other; // Through Deref
+                $crate::__cf_macro_helpers::PartialEq::eq(this, other)
+            }
+        }
+
+        impl $crate::__cf_macro_helpers::Eq for $ty {}
+
+        impl $crate::__cf_macro_helpers::Hash for $ty {
+            #[inline]
+            fn hash<H: $crate::__cf_macro_helpers::Hasher>(&self, state: &mut H) {
+                let this: &$crate::CFType = self; // Through Deref
+                $crate::__cf_macro_helpers::Hash::hash(this, state);
+            }
+        }
+
+        impl $crate::__cf_macro_helpers::fmt::Debug for $ty {
+            fn fmt(
+                &self,
+                f: &mut $crate::__cf_macro_helpers::fmt::Formatter<'_>,
+            ) -> $crate::__cf_macro_helpers::fmt::Result {
+                let this: &$crate::CFType = self; // Through Deref
+                $crate::__cf_macro_helpers::fmt::Debug::fmt(this, f)
+            }
+        }
     };
 }
 
 #[cfg(not(feature = "CFBase"))]
 #[doc(hidden)]
 #[macro_export]
-macro_rules! __cf_type_convert_cf_type {
+macro_rules! __cf_type_needs_cf_base {
     ($ty:ty) => {};
 }
 

framework-crates/objc2-core-foundation/src/string.rs

@@ -303,5 +303,16 @@ mod tests {
         assert_eq!(cf.to_string(), "xyz");
     }
 
+    #[test]
+    fn eq() {
+        assert_eq!(CFString::from_str("abc"), CFString::from_str("abc"));
+        assert_ne!(CFString::from_str("abc"), CFString::from_str("xyz"));
+        // Cross-type comparison
+        assert_ne!(
+            **CFString::from_str("abc"),
+            **unsafe { kCFAllocatorNull }.unwrap()
+        );
+    }
+
     // TODO: Test mutation while formatting.
 }