Merge branch 'main' into android-ci

Author: stephencelis

.github/assert-no-difference.png

@@ -43,7 +43,7 @@ jobs:
         run: make test-linux SWIFT_VERSION=${{ matrix.swift }}
 
   wasm:
-    name: SwiftWasm
+    name: Wasm
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -52,10 +52,11 @@ jobs:
         run: |
           PREFIX=/opt/swift
           set -ex
-          curl -f -o /tmp/swift.tar.gz "https://download.swift.org/swift-6.0.2-release/ubuntu2204/swift-6.0.2-RELEASE/swift-6.0.2-RELEASE-ubuntu22.04.tar.gz"
+          curl -f -o /tmp/swift.tar.gz "https://download.swift.org/swift-6.0.3-release/ubuntu2204/swift-6.0.3-RELEASE/swift-6.0.3-RELEASE-ubuntu22.04.tar.gz"
           sudo mkdir -p $PREFIX; sudo tar -xzf /tmp/swift.tar.gz -C $PREFIX --strip-component 1
-          $PREFIX/usr/bin/swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.0.2-RELEASE/swift-wasm-6.0.2-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 6ffedb055cb9956395d9f435d03d53ebe9f6a8d45106b979d1b7f53358e1dcb4
+          $PREFIX/usr/bin/swift sdk install https://github.com/swiftwasm/swift/releases/download/swift-wasm-6.0.3-RELEASE/swift-wasm-6.0.3-RELEASE-wasm32-unknown-wasi.artifactbundle.zip --checksum 31d3585b06dd92de390bacc18527801480163188cd7473f492956b5e213a8618
           echo "$PREFIX/usr/bin" >> $GITHUB_PATH
+
       - name: Build
         run: swift build --swift-sdk wasm32-unknown-wasi -Xlinker -z -Xlinker stack-size=$((1024 * 1024))
       - name: Run tests
@@ -85,4 +86,4 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: "Test Swift Package on Android"
-        uses: skiptools/swift-android-action@v2
+        uses: skiptools/swift-android-action@v2

.github/expect.png

@@ -253,6 +253,25 @@ For a real world use case we modified Apple's [Landmarks](https://developer.appl
 
 ### `expectNoDifference`
 
+<table>
+<tr>
+<th>expectNoDifference</th>
+<th>#expect</th>
+</tr>
+<tr valign=top>
+<td width=50%>
+
+![](.github/assert-no-difference.png)
+
+</td>
+<td width=50%>
+
+![](.github/expect.png)
+
+</td>
+</tr>
+</table>
+
 XCTest's `XCTAssertEqual` and Swift Testing's `#expect(_ == _)` both allow you to assert that two values are equal, and if they are not the test suite will fail with a message:
 
 ```swift

.github/workflows/ci.yml

@@ -28,6 +28,10 @@ extension Mirror {
 
 func isMirrorEqual(_ lhs: Any, _ rhs: Any) -> Bool {
   guard let lhs = lhs as? any Equatable else {
+    let lhsType = type(of: lhs)
+    if lhsType is AnyClass, lhsType == type(of: rhs), lhs as AnyObject === rhs as AnyObject {
+      return true
+    }
     let lhsMirror = Mirror(customDumpReflecting: lhs)
     let rhsMirror = Mirror(customDumpReflecting: rhs)
     guard

README.md

@@ -1290,6 +1290,15 @@ final class DiffTests: XCTestCase {
       """
     )
   }
+
+  func testRecursion() {
+    class Object {
+      var child: Object?
+    }
+    let object = Object()
+    object.child = object
+    XCTAssertNil(diff(object, object))
+  }
 }
 
 private class Shared: _CustomDiffObject, Equatable {