Move foundation macros

Author: madsmtm

objc2/CHANGELOG.md

@@ -12,6 +12,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   feature flags to make the `class!` macro zero cost.
 * Moved the external crate `objc2_foundation` into `objc2::foundation` under
   (default) feature flag `"foundation"`.
+* Added `declare_class!`, `extern_class!` and `ns_string!` macros from
+  `objc2-foundation`.
+
+### Changed
+* Change selector syntax in `declare_class!` macro to be more Rust-like.
 
 
 ## 0.3.0-beta.1 - 2022-07-19

objc2/CHANGELOG_FOUNDATION.md

@@ -16,7 +16,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * Add extra `Extend<&u8>` impl for `NSMutableData`.
 
 ### Changed
-* Change selector syntax in `declare_class!` macro to be more Rust-like.
 * **BREAKING**: Moved from external crate `objc2_foundation` into
   `objc2::foundation`.
 
@@ -36,7 +35,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
   safe to call on the main thread.
 * Added `NSException` object.
 * Added `extern_class!` macro to help with defining interfaces to classes.
+  Further changelog for this can be found in `CHANGELOG.md`.
 * Added `declare_class!` macro to help with declaring custom classes.
+  Further changelog for this can be found in `CHANGELOG.md`.
 * Expose the `objc2` version that this uses in the crate root.
 * Added `NSZone`.
 

objc2/src/foundation/mod.rs

@@ -65,19 +65,15 @@ extern "C" {}
 #[link(name = "gnustep-base", kind = "dylib")]
 extern "C" {}
 
-#[doc(hidden)]
-pub mod __string_macro;
 mod array;
 mod attributed_string;
 mod comparison_result;
 mod copying;
 mod data;
-mod declare_macro;
 mod dictionary;
 mod enumerator;
 mod exception;
 mod geometry;
-mod macros;
 mod mutable_array;
 mod mutable_attributed_string;
 mod mutable_data;

objc2/src/lib.rs

@@ -228,7 +228,8 @@ pub extern crate self as objc2;
 #[doc(hidden)]
 pub extern crate std as __std;
 #[doc(hidden)]
-pub use self::foundation::__string_macro;
+#[cfg(feature = "foundation")]
+pub use self::macros::ns_string as __string_macro;
 
 // Hack to make doctests work
 #[cfg(all(feature = "apple", feature = "unstable-static-class"))]

objc2/src/macros.rs

@@ -1,3 +1,9 @@
+mod declare_class;
+mod extern_class;
+#[doc(hidden)]
+#[cfg(feature = "foundation")]
+pub mod ns_string;
+
 /// Gets a reference to a [`Class`] from the given name.
 ///
 /// [`Class`]: crate::runtime::Class

objc2/src/foundation/declare_macro.rs renamed to objc2/src/macros/declare_class.rs

@@ -17,7 +17,7 @@ use core::sync::atomic::{AtomicPtr, Ordering};
 use objc2::rc::Id;
 use objc2::runtime::Class;
 
-use super::NSString;
+use crate::foundation::NSString;
 
 // This is defined in CoreFoundation, but we don't emit a link attribute
 // here because it is already linked via Foundation.
@@ -508,7 +508,7 @@ mod tests {
             "\0",
             "\0\x01\x02\x03\x04\x05\x06\x07\x08\x09",
             // "\u{feff}", // TODO
-            include_str!("__string_macro.rs"),
+            include_str!("ns_string.rs"),
         }
     }