Improve examples and remove redundant linking code

Author: madsmtm

objc2/benches/autorelease.rs

@@ -5,14 +5,6 @@ use objc2::rc::{autoreleasepool, Id, Shared};
 use objc2::runtime::{Class, Object, Sel};
 use objc2::{class, msg_send, sel};
 
-#[cfg(feature = "apple")]
-#[link(name = "Foundation", kind = "framework")]
-extern "C" {}
-
-#[cfg(feature = "gnustep-1-7")]
-#[link(name = "gnustep-base", kind = "dylib")]
-extern "C" {}
-
 const BYTES: &[u8] = &[1, 2, 3, 4, 5, 6, 7, 8, 9, 10];
 
 fn empty() {

objc2/examples/introspection.rs

@@ -1,16 +1,13 @@
+use objc2::msg_send;
 use objc2::rc::{Id, Owned};
-use objc2::runtime::{Class, Object};
-use objc2::{class, msg_send, msg_send_id};
+use objc2::runtime::Class;
+use objc2::{foundation::NSObject, msg_send_id};
 #[cfg(feature = "malloc")]
 use objc2::{sel, Encode};
 
-#[cfg(feature = "apple")]
-#[link(name = "Foundation", kind = "framework")]
-extern "C" {}
-
 fn main() {
     // Get a class
-    let cls = class!(NSObject);
+    let cls = NSObject::class();
     println!("NSObject size: {}", cls.instance_size());
 
     #[cfg(feature = "malloc")]
@@ -23,10 +20,12 @@ fn main() {
     }
 
     // Allocate an instance
-    let obj: Id<Object, Owned> = unsafe {
+    let obj: Id<NSObject, Owned> = unsafe {
         let obj = msg_send_id![cls, alloc];
         msg_send_id![obj, init].unwrap()
     };
+    // In this case `let obj = NSObject::new()` would have been the same
+
     println!("NSObject address: {:p}", obj);
 
     // Access an ivar of the object

objc2/examples/talk_to_me.rs

@@ -11,42 +11,21 @@ fn main() {
 
 #[cfg(talk_to_me_example)]
 fn main() {
-    use objc2::ffi::NSUInteger;
-    use objc2::rc::{Id, Owned, Shared};
+    use objc2::rc::{Id, Owned};
     use objc2::runtime::Object;
-    use objc2::{class, msg_send, msg_send_bool, msg_send_id};
-    use std::ffi::c_void;
+    use objc2::{class, msg_send, msg_send_bool, msg_send_id, ns_string};
 
-    #[cfg(feature = "apple")]
     #[link(name = "AVFoundation", kind = "framework")]
     extern "C" {}
-    #[cfg(feature = "apple")]
-    #[link(name = "Foundation", kind = "framework")]
-    extern "C" {}
-
-    const UTF8_ENCODING: NSUInteger = 4;
 
-    let text = "Hello from Rust!";
-
-    // Note: objc2-foundation has functionality to do this safely!
-    let string = unsafe { msg_send_id![class!(NSString), alloc] };
-    let text_ptr: *const c_void = text.as_ptr().cast();
-    let string: Id<Object, Shared> = unsafe {
-        msg_send_id![
-            string,
-            initWithBytes: text_ptr,
-            length: text.len(),
-            encoding: UTF8_ENCODING,
-        ]
-    }
-    .unwrap();
+    let string = ns_string!("Hello from Rust!");
 
     let synthesizer: Id<Object, Owned> =
         unsafe { msg_send_id![class!(AVSpeechSynthesizer), new] }.unwrap();
 
     let utterance = unsafe { msg_send_id![class!(AVSpeechUtterance), alloc] };
     let utterance: Id<Object, Owned> =
-        unsafe { msg_send_id![utterance, initWithString: &*string] }.unwrap();
+        unsafe { msg_send_id![utterance, initWithString: string] }.unwrap();
 
     // let _: () = unsafe { msg_send![&utterance, setVolume: 90.0f32 };
     // let _: () = unsafe { msg_send![&utterance, setRate: 0.50f32 };

objc2/src/foundation/string.rs

@@ -307,12 +307,6 @@ mod tests {
     use alloc::format;
     use core::ptr;
 
-    #[cfg(feature = "gnustep-1-7")]
-    #[test]
-    fn ensure_linkage() {
-        unsafe { objc2::__gnustep_hack::get_class_to_force_linkage() };
-    }
-
     #[test]
     fn test_equality() {
         let s1 = NSString::from_str("abc");

objc2/src/lib.rs

@@ -219,11 +219,6 @@ mod test_utils;
 #[cfg(feature = "malloc")]
 mod verify;
 
-// Hack to make doctests work
-#[cfg(all(feature = "apple", feature = "unstable-static-class"))]
-#[link(name = "Foundation", kind = "framework")]
-extern "C" {}
-
 /// Hacky way to make GNUStep link properly to Foundation while testing.
 ///
 /// This is a temporary solution to make our CI work for now!
@@ -232,8 +227,6 @@ extern "C" {}
 pub mod __gnustep_hack {
     use super::runtime::Class;
 
-    #[link(name = "gnustep-base", kind = "dylib")]
-    // This linking doesn't have to be on the correct `extern` block.
     extern "C" {
         // The linking changed in libobjc2 v2.0
         #[cfg_attr(feature = "gnustep-2-0", link_name = "._OBJC_CLASS_NSObject")]

objc2/tests/id_retain_autoreleased.rs

@@ -10,10 +10,6 @@ fn ensure_linkage() {
     unsafe { objc2::__gnustep_hack::get_class_to_force_linkage() };
 }
 
-#[cfg(feature = "apple")]
-#[link(name = "Foundation", kind = "framework")]
-extern "C" {}
-
 fn retain_count(obj: &Object) -> usize {
     unsafe { msg_send![obj, retainCount] }
 }

objc2/tests/no_prelude.rs

@@ -15,10 +15,6 @@ fn ensure_linkage() {
     unsafe { new_objc2::__gnustep_hack::get_class_to_force_linkage() };
 }
 
-#[cfg(feature = "apple")]
-#[link(name = "Foundation", kind = "framework")]
-extern "C" {}
-
 mod core {}
 mod std {}
 mod libc {}

objc2/tests/use_macros.rs

@@ -7,10 +7,6 @@ fn ensure_linkage() {
     unsafe { objc2::__gnustep_hack::get_class_to_force_linkage() };
 }
 
-#[cfg(feature = "apple")]
-#[link(name = "Foundation", kind = "framework")]
-extern "C" {}
-
 #[test]
 fn use_class_and_msg_send() {
     unsafe {

test-assembly/crates/test_static_class/lib.rs

@@ -3,10 +3,6 @@
 use objc2::class;
 use objc2::runtime::Class;
 
-#[cfg(feature = "apple")]
-#[link(name = "Foundation", kind = "framework")]
-extern "C" {}
-
 #[no_mangle]
 fn get_class() -> &'static Class {
     class!(NSObject)