Use AnyHashableSendable from Concurrency Extras (#3428)

stephencelis · web-flow · commit f9f3e3a4cb9e · 2024-10-08T13:08:38.000-07:00
* Use `AnyHashableSendable` from Concurrency Extras

Rather than use an ad hoc implementation with an `AnyHashable` under the
hood that may not be concurrency safe, let's adopt the helper we added
to the Concurrency Extras packages.

* fix

* wip

* wip
diff --git a/.github/package.xcworkspace/xcshareddata/swiftpm/Package.resolved b/.github/package.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved b/ComposableArchitecture.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/03-Effects-LongLiving.swift b/Examples/CaseStudies/SwiftUICaseStudies/03-Effects-LongLiving.swift
@@ -48,19 +48,17 @@ struct LongLivingEffects {
 }
 
 extension DependencyValues {
-  var screenshots: @Sendable () async -> AsyncStream<Void> {
+  var screenshots: @Sendable () async -> any AsyncSequence<Void, Never> {
     get { self[ScreenshotsKey.self] }
     set { self[ScreenshotsKey.self] = newValue }
   }
 }
 
 private enum ScreenshotsKey: DependencyKey {
-  static let liveValue: @Sendable () async -> AsyncStream<Void> = {
-    AsyncStream(
-      NotificationCenter.default
-        .notifications(named: UIApplication.userDidTakeScreenshotNotification)
-        .map { _ in }
-    )
+  static let liveValue: @Sendable () async -> any AsyncSequence<Void, Never> = {
+    NotificationCenter.default
+      .notifications(named: UIApplication.userDidTakeScreenshotNotification)
+      .map { _ in }
   }
 }
 
diff --git a/Examples/CaseStudies/SwiftUICaseStudies/FactClient.swift b/Examples/CaseStudies/SwiftUICaseStudies/FactClient.swift
@@ -30,10 +30,3 @@ extension FactClient: DependencyKey {
   /// to prove do not need the dependency.
   static let testValue = Self()
 }
-
-struct AnyHashableSendable: Hashable, @unchecked Sendable {
-  let base: AnyHashable
-  init<Base: Hashable & Sendable>(_ base: Base) {
-    self.base = base
-  }
-}
diff --git a/Package.swift b/Package.swift
@@ -21,7 +21,7 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-collections", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.2"),
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.4"),
-    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.1.0"),
+    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.2.0"),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
     .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),
diff --git a/Package@swift-6.0.swift b/Package@swift-6.0.swift
@@ -21,7 +21,7 @@ let package = Package(
     .package(url: "https://github.com/apple/swift-collections", from: "1.1.0"),
     .package(url: "https://github.com/pointfreeco/combine-schedulers", from: "1.0.2"),
     .package(url: "https://github.com/pointfreeco/swift-case-paths", from: "1.5.4"),
-    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.1.0"),
+    .package(url: "https://github.com/pointfreeco/swift-concurrency-extras", from: "1.2.0"),
     .package(url: "https://github.com/pointfreeco/swift-custom-dump", from: "1.3.2"),
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.4.0"),
     .package(url: "https://github.com/pointfreeco/swift-identified-collections", from: "1.1.0"),
diff --git a/Sources/ComposableArchitecture/Effect.swift b/Sources/ComposableArchitecture/Effect.swift
@@ -46,11 +46,11 @@ extension Effect {
 
   /// Wraps an asynchronous unit of work that can emit actions any number of times in an effect.
   ///
-  /// For example, if you had an async stream in a dependency client:
+  /// For example, if you had an async sequence in a dependency client:
   ///
   /// ```swift
   /// struct EventsClient {
-  ///   var events: () -> AsyncStream<Event>
+  ///   var events: () -> any AsyncSequence<Event, Never>
   /// }
   /// ```
   ///
diff --git a/Sources/ComposableArchitecture/Internal/NavigationID.swift b/Sources/ComposableArchitecture/Internal/NavigationID.swift
@@ -123,10 +123,3 @@ struct NavigationID: Hashable, @unchecked Sendable {
     hasher.combine(self.tag)
   }
 }
-
-@_spi(Internals) public struct AnyHashableSendable: Hashable, @unchecked Sendable {
-  @_spi(Internals) public let base: AnyHashable
-  init<Base: Hashable & Sendable>(_ base: Base) {
-    self.base = base
-  }
-}
diff --git a/Tests/ComposableArchitectureTests/FileStorageTests.swift b/Tests/ComposableArchitectureTests/FileStorageTests.swift
@@ -409,8 +409,8 @@ final class FileStorageTests: XCTestCase {
         await Task.yield()
         expectNoDifference(users, [.blob])
 
-        $users.withLock { $0 = [.blobJr] }  // NB: Saved immediately
-        $users.withLock { $0 = [.blobSr] }  // NB: Throttled for 1 second
+        await $users.withLock { $0 = [.blobJr] }  // NB: Saved immediately
+        await $users.withLock { $0 = [.blobSr] }  // NB: Throttled for 1 second
         try FileManager.default.removeItem(at: .fileURL)
         try await Task.sleep(nanoseconds: 1_200_000_000)
         expectNoDifference(users, [.blob])

Original file line number	Diff line number	Diff line change
`@@ -48,19 +48,17 @@ struct LongLivingEffects {`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`extension DependencyValues {`
`51`		`- var screenshots: @Sendable () async -> AsyncStream<Void> {`
	`51`	`+ var screenshots: @Sendable () async -> any AsyncSequence<Void, Never> {`
`52`	`52`	`get { self[ScreenshotsKey.self] }`
`53`	`53`	`set { self[ScreenshotsKey.self] = newValue }`
`54`	`54`	`}`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`private enum ScreenshotsKey: DependencyKey {`
`58`		`- static let liveValue: @Sendable () async -> AsyncStream<Void> = {`
`59`		`- AsyncStream(`
`60`		`- NotificationCenter.default`
`61`		`- .notifications(named: UIApplication.userDidTakeScreenshotNotification)`
`62`		`- .map { _ in }`
`63`		`- )`
	`58`	`+ static let liveValue: @Sendable () async -> any AsyncSequence<Void, Never> = {`
	`59`	`+ NotificationCenter.default`
	`60`	`+ .notifications(named: UIApplication.userDidTakeScreenshotNotification)`
	`61`	`+ .map { _ in }`
`64`	`62`	`}`
`65`	`63`	`}`
`66`	`64`
Original file line number	Diff line number	Diff line change
`@@ -123,10 +123,3 @@ struct NavigationID: Hashable, @unchecked Sendable {`
`123`	`123`	`hasher.combine(self.tag)`
`124`	`124`	`}`
`125`	`125`	`}`
`126`		`-`
`127`		`-@_spi(Internals) public struct AnyHashableSendable: Hashable, @unchecked Sendable {`
`128`		`- @_spi(Internals) public let base: AnyHashable`
`129`		`- init<Base: Hashable & Sendable>(_ base: Base) {`
`130`		`- self.base = base`
`131`		`- }`
`132`		`-}`