Merge pull request #84 from madsmtm/various-small-fixes

Various fixes

Author: madsmtm

.github/workflows/gnustep.yml

@@ -23,7 +23,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Install Clang
-      run: sudo apt-get install clang
+      run: sudo apt-get -y install clang
 
     - name: Cache GNUStep
       id: cache-gnustep
@@ -53,9 +53,9 @@ jobs:
         echo "CPATH=$HOME/gnustep/include:$CPATH" >> $GITHUB_ENV
         ls -al ~/gnustep/* || true # Ignore failures
 
-    - name: Install Make
+    - name: Install Make and Cmake
       if: steps.cache-gnustep.outputs.cache-hit != 'true'
-      run: sudo apt-get install make
+      run: sudo apt-get -y install make cmake
 
     - name: Install GNUStep libobjc2
       if: steps.cache-gnustep.outputs.cache-hit != 'true'

block2/README.md

@@ -43,7 +43,7 @@ struct. For example, to create a block that adds two `i32`s, we could write:
 use block2::ConcreteBlock;
 let block = ConcreteBlock::new(|a: i32, b: i32| a + b);
 let block = block.copy();
-assert!(unsafe { block.call((5, 8)) } == 13);
+assert_eq!(unsafe { block.call((5, 8)) }, 13);
 ```
 
 It is important to copy your block to the heap (with the `copy` method) before

block2/src/lib.rs

@@ -36,7 +36,7 @@ struct. For example, to create a block that adds two `i32`s, we could write:
 # use block2::ConcreteBlock;
 let block = ConcreteBlock::new(|a: i32, b: i32| a + b);
 let block = block.copy();
-assert!(unsafe { block.call((5, 8)) } == 13);
+assert_eq!(unsafe { block.call((5, 8)) }, 13);
 ```
 
 It is important to copy your block to the heap (with the `copy` method) before

objc-sys/CHANGELOG.md

@@ -10,6 +10,15 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * `NSInteger` and `NSUInteger` (type aliases of `isize`/`usize`).
 * `NSIntegerMax`, `NSIntegerMin` and `NSUIntegerMax`.
 
+### Changed
+* **BREAKING**: `cfg`-guarded `class_getImageName` to only appear on Apple
+  platforms.
+
+  This is a breaking change, but it will be allowed in a semver-compatible
+  release, since it is unlikely that anyone is using it, and the symbol is not
+  present on other platforms anyhow, so users will just get an error at
+  link-time.
+
 
 ## 0.1.0 - 2021-11-22
 

objc-sys/README.md

@@ -70,14 +70,16 @@ runtimes, since support for reference-counting primitives like `objc_retain`
 and `objc_autoreleasePoolPop` is a vital requirement for most applications.
 
 Just so we're being clear, this rules out the GCC [`libobjc`][gcc-libobjc]
-runtime (see [this][gcc-objc-support]), and the [`mulle-objc`] runtime. (But
-support for [`ObjFW`] may be added). More information on different runtimes
-can be found in GNUStep's [Objective-C Compiler and Runtime FAQ][gnustep-faq].
+runtime (see [this][gcc-objc-support]), the [`mulle-objc`] runtime and
+[cocotron]. (But support for [`ObjFW`] may be added).
+More information on different runtimes can be found in GNUStep's
+[Objective-C Compiler and Runtime FAQ][gnustep-faq].
 
 [modern]: https://en.wikipedia.org/wiki/Objective-C#Modern_Objective-C
 [gcc-libobjc]: https://github.com/gcc-mirror/gcc/tree/master/libobjc
 [gcc-objc-support]: https://gcc.gnu.org/onlinedocs/gcc/Standards.html#Objective-C-and-Objective-C_002b_002b-Languages
 [`mulle-objc`]: https://github.com/mulle-objc/mulle-objc-runtime
+[cocotron]: https://cocotron.org/
 [`ObjFW`]: https://github.com/ObjFW/ObjFW
 [gnustep-faq]: http://wiki.gnustep.org/index.php/Objective-C_Compiler_and_Runtime_FAQ
 

objc-sys/build.rs

@@ -200,6 +200,12 @@ fn main() {
     // Add CC arguments
     // Assume the compiler is clang; if it isn't, this is probably going to
     // fail anyways, since we're using newer runtimes than GCC supports.
+    //
+    // TODO: Should add we these, or is it someone else's responsibility?
+    // - `-mios-simulator-version-min={}`
+    // - `-miphoneos-version-min={}`
+    // - `-mmacosx-version-min={}`
+    // - ...
     println!(
         "cargo:cc_args=-fobjc-arc -fobjc-arc-exceptions -fobjc-exceptions -fobjc-runtime={}",
         // TODO: -fobjc-weak ?

objc-sys/src/class.rs

@@ -90,6 +90,7 @@ extern "C" {
         name: *const objc_selector,
     ) -> *const objc_method;
     pub fn class_getClassVariable(cls: *const objc_class, name: *const c_char) -> *const objc_ivar;
+    #[cfg(apple)]
     pub fn class_getImageName(cls: *const objc_class) -> *const c_char;
     pub fn class_getInstanceMethod(
         cls: *const objc_class,

objc2-encode/src/encoding.rs

@@ -198,8 +198,8 @@ mod tests {
         let i = Encoding::Int;
         let p = Encoding::Pointer(&Encoding::Int);
 
-        assert!(p == p);
-        assert!(p != i);
+        assert_eq!(p, p);
+        assert_ne!(p, i);
     }
 
     #[test]
@@ -213,8 +213,8 @@ mod tests {
         let i = Encoding::Int;
         let c = Encoding::Char;
 
-        assert!(i == i);
-        assert!(i != c);
+        assert_eq!(i, i);
+        assert_ne!(i, c);
     }
 
     #[test]
@@ -227,8 +227,8 @@ mod tests {
     #[test]
     fn test_struct_eq() {
         let s = Encoding::Struct("CGPoint", &[Encoding::Char, Encoding::Int]);
-        assert!(s == s);
-        assert!(s != Encoding::Int);
+        assert_eq!(s, s);
+        assert_ne!(s, Encoding::Int);
     }
 
     #[test]
@@ -241,7 +241,7 @@ mod tests {
     #[test]
     fn test_union_eq() {
         let u = Encoding::Union("Onion", &[Encoding::Char, Encoding::Int]);
-        assert!(u == u);
-        assert!(u != Encoding::Int);
+        assert_eq!(u, u);
+        assert_ne!(u, Encoding::Int);
     }
 }

objc2-foundation/src/array.rs

@@ -428,7 +428,7 @@ mod tests {
     fn test_iter() {
         let array = sample_array(4);
 
-        assert!(array.iter().count() == 4);
+        assert_eq!(array.iter().count(), 4);
         assert!(array
             .iter()
             .enumerate()

objc2-foundation/src/enumerator.rs

@@ -133,8 +133,9 @@ impl<'a, C: INSFastEnumeration> NSFastEnumerator<'a, C> {
         if let Some(buf) = next_buf {
             // Check if the collection was mutated
             if let Some(mutations) = mutations {
-                assert!(
-                    mutations == unsafe { *self.state.mutations_ptr },
+                assert_eq!(
+                    mutations,
+                    unsafe { *self.state.mutations_ptr },
                     "Mutation detected during enumeration of object {:p}",
                     self.object
                 );
@@ -178,7 +179,7 @@ mod tests {
         let array = NSArray::from_vec(vec);
 
         let enumerator = array.iter();
-        assert!(enumerator.count() == 4);
+        assert_eq!(enumerator.count(), 4);
 
         let enumerator = array.iter();
         assert!(enumerator.enumerate().all(|(i, obj)| obj.get() == i as u32));
@@ -190,7 +191,7 @@ mod tests {
         let array = NSArray::from_vec(vec);
 
         let enumerator = array.enumerator();
-        assert!(enumerator.count() == 4);
+        assert_eq!(enumerator.count(), 4);
 
         let enumerator = array.enumerator();
         assert!(enumerator.enumerate().all(|(i, obj)| obj.get() == i as u32));