Renamed object! macro to extern_class!

Author: madsmtm

objc2-foundation/CHANGELOG.md

@@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Added `MainThreadMarker` to help with designing APIs where a method is only
   safe to call on the main thread.
 * Added `NSException` object.
-* Added `object!` macro to help with defining other classes.
+* Added `extern_class!` macro to help with defining other classes.
 * Expose the `objc2` version that this uses in the crate root.
 
 ### Changed

objc2-foundation/src/array.rs

@@ -14,7 +14,7 @@ use super::{
     NSRange,
 };
 
-__inner_object! {
+__inner_extern_class! {
     /// TODO
     ///
     /// You can have a `Id<NSArray<T, Owned>, Owned>`, which allows mutable access
@@ -43,7 +43,7 @@ unsafe impl<T: Sync + Send> Send for NSArray<T, Shared> {}
 unsafe impl<T: Sync> Sync for NSArray<T, Owned> {}
 unsafe impl<T: Send> Send for NSArray<T, Owned> {}
 
-__inner_object! {
+__inner_extern_class! {
     // TODO: Ensure that this deref to NSArray is safe!
     // This "inherits" NSArray, and has the same `Send`/`Sync` impls as that.
     #[derive(Debug, PartialEq, Eq, Hash)]

objc2-foundation/src/attributed_string.rs

@@ -6,7 +6,7 @@ use crate::{
     NSCopying, NSDictionary, NSMutableAttributedString, NSMutableCopying, NSObject, NSString,
 };
 
-object! {
+extern_class! {
     /// A string that has associated attributes for portions of its text.
     ///
     /// Examples of attributes could be: Visual style, hyperlinks, or

objc2-foundation/src/data.rs

@@ -11,7 +11,7 @@ use objc2::{msg_send, msg_send_id};
 
 use super::{NSCopying, NSMutableCopying, NSObject, NSRange};
 
-object! {
+extern_class! {
     /// A static byte buffer in memory.
     ///
     /// This is similar to a [`slice`][`prim@slice`] of [`u8`].
@@ -25,7 +25,7 @@ object! {
 unsafe impl Sync for NSData {}
 unsafe impl Send for NSData {}
 
-object! {
+extern_class! {
     /// A dynamic byte buffer in memory.
     ///
     /// This is the Objective-C equivalent of a [`Vec`] containing [`u8`].

objc2-foundation/src/dictionary.rs

@@ -9,7 +9,7 @@ use objc2::{msg_send, msg_send_id, Message};
 
 use super::{NSArray, NSCopying, NSEnumerator, NSFastEnumeration, NSObject};
 
-__inner_object! {
+__inner_extern_class! {
     #[derive(Debug, PartialEq, Eq, Hash)]
     unsafe pub struct NSDictionary<K, V>: NSObject {
         key: PhantomData<Id<K, Shared>>,

objc2-foundation/src/exception.rs

@@ -9,7 +9,7 @@ use objc2::{msg_send, msg_send_id, sel};
 
 use crate::{NSCopying, NSDictionary, NSObject, NSString};
 
-object! {
+extern_class! {
     /// A special condition that interrupts the normal flow of program
     /// execution.
     ///

objc2-foundation/src/macros.rs

@@ -43,12 +43,12 @@
 /// ```
 /// use objc2::msg_send_id;
 /// use objc2::rc::{Id, Shared};
-/// use objc2_foundation::{object, NSObject};
+/// use objc2_foundation::{extern_class, NSObject};
 /// #
 /// # #[cfg(feature = "gnustep-1-7")]
 /// # unsafe { objc2::__gnustep_hack::get_class_to_force_linkage() };
 ///
-/// object! {
+/// extern_class! {
 ///     /// An example description.
 ///     #[derive(PartialEq, Eq, Hash)] // Uses `NSObject`'s implementation
 ///     // Specify class and superclass
@@ -67,14 +67,14 @@
 /// declared previously to specify as its superclass.
 ///
 /// ```
-/// use objc2_foundation::{object, NSObject};
+/// use objc2_foundation::{extern_class, NSObject};
 /// #
-/// # object! {
+/// # extern_class! {
 /// #     #[derive(PartialEq, Eq, Hash)]
 /// #     unsafe pub struct NSFormatter: NSObject;
 /// # }
 ///
-/// object! {
+/// extern_class! {
 ///     #[derive(PartialEq, Eq, Hash)]
 ///     // Specify the correct inheritance chain
 ///     // `NSDateFormatter` subclasses `NSFormatter` which subclasses `NSObject`
@@ -84,12 +84,12 @@
 ///
 /// See the source code of `objc2_foundation` in general for more examples.
 #[macro_export]
-macro_rules! object {
+macro_rules! extern_class {
     (
         $(#[$m:meta])*
         unsafe $v:vis struct $name:ident: $($inheritance_chain:ty),+;
     ) => {
-        $crate::__inner_object! {
+        $crate::__inner_extern_class! {
             @__inner
             $(#[$m])*
             unsafe $v struct $name<>: $($inheritance_chain,)+ $crate::objc2::runtime::Object {}
@@ -146,15 +146,15 @@ macro_rules! __impl_as_ref_borrow {
 
 #[doc(hidden)]
 #[macro_export]
-macro_rules! __inner_object {
+macro_rules! __inner_extern_class {
     // TODO: Expose this variant in the `object` macro.
     (
         $(#[$m:meta])*
         unsafe $v:vis struct $name:ident<$($t:ident $(: $b:ident)?),*>: $($inheritance_chain:ty),+ {
             $($p:ident: $pty:ty,)*
         }
     ) => {
-        $crate::__inner_object! {
+        $crate::__inner_extern_class! {
             @__inner
             $(#[$m])*
             unsafe $v struct $name<$($t $(: $b)?),*>: $($inheritance_chain,)+ $crate::objc2::runtime::Object {

objc2-foundation/src/mutable_attributed_string.rs

@@ -3,7 +3,7 @@ use objc2::{msg_send, msg_send_id};
 
 use crate::{NSAttributedString, NSCopying, NSMutableCopying, NSObject, NSString};
 
-object! {
+extern_class! {
     /// A mutable string that has associated attributes.
     ///
     /// See [Apple's documentation](https://developer.apple.com/documentation/foundation/nsmutableattributedstring?language=objc).

objc2-foundation/src/mutable_string.rs

@@ -8,7 +8,7 @@ use objc2::{msg_send, msg_send_id};
 
 use crate::{NSCopying, NSMutableCopying, NSObject, NSString};
 
-object! {
+extern_class! {
     /// A dynamic plain-text Unicode string object.
     ///
     /// See [Apple's documentation](https://developer.apple.com/documentation/foundation/nsmutablestring?language=objc).

objc2-foundation/src/object.rs

@@ -7,7 +7,7 @@ use objc2::{msg_send, msg_send_bool, msg_send_id};
 
 use super::NSString;
 
-__inner_object! {
+__inner_extern_class! {
     @__inner
     unsafe pub struct NSObject<>: Object {}
 }

objc2-foundation/src/process_info.rs

@@ -3,7 +3,7 @@ use objc2::rc::{Id, Shared};
 
 use crate::{NSObject, NSString};
 
-object! {
+extern_class! {
     /// A collection of information about the current process.
     ///
     /// See [Apple's documentation](https://developer.apple.com/documentation/foundation/nsprocessinfo?language=objc).

objc2-foundation/src/string.rs

@@ -27,7 +27,7 @@ const UTF8_ENCODING: i32 = 4;
 #[allow(non_upper_case_globals)]
 const NSNotFound: ffi::NSInteger = ffi::NSIntegerMax;
 
-object! {
+extern_class! {
     /// A static, plain-text Unicode string object.
     ///
     /// See [Apple's documentation](https://developer.apple.com/documentation/foundation/nsstring?language=objc).

objc2-foundation/src/thread.rs

@@ -5,7 +5,7 @@ use objc2::{msg_send, msg_send_bool, msg_send_id};
 
 use crate::{NSObject, NSString};
 
-object! {
+extern_class! {
     /// A thread of execution.
     ///
     /// See [Apple's documentation](https://developer.apple.com/documentation/foundation/nsthread?language=objc).

objc2-foundation/src/uuid.rs

@@ -3,7 +3,7 @@ use objc2::{msg_send, msg_send_id, Encode, Encoding, RefEncode};
 
 use super::{NSCopying, NSObject};
 
-object! {
+extern_class! {
     /// A universally unique value.
     ///
     /// Can be used to identify types, interfaces, and other items.

objc2-foundation/src/value.rs

@@ -14,7 +14,7 @@ use objc2::{msg_send, msg_send_id};
 
 use super::{NSCopying, NSObject};
 
-__inner_object! {
+__inner_extern_class! {
     // `T: Eq` bound correct to prevent `NSValue<f32>` from being `Eq`
     // (even though `[NAN isEqual: NAN]` is true in Objective-C).
     #[derive(Debug, PartialEq, Eq, Hash)]