Fix linking of classes under test in objc_foundation and objc_id

Author: madsmtm

objc_foundation/src/lib.rs

@@ -20,7 +20,14 @@ use objc::runtime::Class;
 
 #[cfg(not(any(target_os = "macos", target_os = "ios")))]
 #[link(name = "gnustep-base", kind = "dylib")]
-extern { static _OBJC_CLASS_NSObject : Class; }
+extern "C" {}
+
+// Split up to illustrate that the linking doesn't have to be annotated on the
+// correct `extern` block.
+#[cfg(not(any(target_os = "macos", target_os = "ios")))]
+extern "C" {
+    static _OBJC_CLASS_NSObject: Class;
+}
 
 #[cfg(not(any(target_os = "macos", target_os = "ios")))]
 #[allow(dead_code)]

objc_foundation/src/string.rs

@@ -84,6 +84,12 @@ impl fmt::Display for NSString {
 mod tests {
     use super::{INSCopying, INSString, NSString};
 
+    #[cfg(not(any(target_os = "macos", target_os = "ios")))]
+    #[test]
+    fn ensure_linkage() {
+        unsafe { crate::get_class_to_force_linkage() };
+    }
+
     #[test]
     fn test_utf8() {
         let expected = "ประเทศไทย中华Việt Nam";

objc_id/src/id.rs

@@ -206,6 +206,12 @@ mod tests {
     use objc::runtime::Object;
     use objc::{class, msg_send};
 
+    #[cfg(not(any(target_os = "macos", target_os = "ios")))]
+    #[test]
+    fn ensure_linkage() {
+        unsafe { crate::get_class_to_force_linkage() };
+    }
+
     fn retain_count(obj: &Object) -> usize {
         unsafe { msg_send![obj, retainCount] }
     }

objc_id/src/lib.rs

@@ -11,7 +11,7 @@ which can be cloned to allow multiple references.
 
 Weak references may be created using the [`WeakId`](struct.WeakId.html) struct.
 
-```
+```no_run
 # use objc::msg_send;
 use objc::runtime::{Class, Object};
 use objc_id::{Id, WeakId};
@@ -41,3 +41,23 @@ assert!(weak.load().is_none());
 pub use id::{Id, Owned, Ownership, ShareId, Shared, WeakId};
 
 mod id;
+
+// TODO: Remove the need for this hack
+
+#[cfg(not(any(target_os = "macos", target_os = "ios")))]
+use objc::runtime::Class;
+
+#[cfg(not(any(target_os = "macos", target_os = "ios")))]
+#[link(name = "gnustep-base", kind = "dylib")]
+extern "C" {}
+
+#[cfg(not(any(target_os = "macos", target_os = "ios")))]
+extern "C" {
+    static _OBJC_CLASS_NSObject: Class;
+}
+
+#[cfg(not(any(target_os = "macos", target_os = "ios")))]
+#[allow(dead_code)]
+unsafe fn get_class_to_force_linkage() -> &'static Class {
+    &_OBJC_CLASS_NSObject
+}