Revamp sendability."

Author: mbrandonw

Examples/Examples.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -33,7 +33,7 @@ let package = Package(
     .package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.9.0"),
     .package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay", from: "1.5.0"),
     .package(url: "https://github.com/pointfreeco/swift-sharing", from: "2.3.0"),
-    .package(url: "https://github.com/pointfreeco/swift-structured-queries", from: "0.7.0"),
+    .package(url: "https://github.com/pointfreeco/swift-structured-queries", branch: "default-main-actor"),
   ],
   targets: [
     .target(

Package.swift

@@ -114,7 +114,7 @@ public struct FetchAll<Element: Sendable>: Sendable {
   ///     (`@Dependency(\.defaultDatabase)`).
   public init<V: QueryRepresentable>(
     wrappedValue: [Element] = [],
-    _ statement: some StructuredQueriesCore.Statement<V>,
+    _ statement: sending some StructuredQueriesCore.Statement<V>,
     database: (any DatabaseReader)? = nil
   )
   where
@@ -138,7 +138,7 @@ public struct FetchAll<Element: Sendable>: Sendable {
   ///     (`@Dependency(\.defaultDatabase)`).
   public init<S: StructuredQueriesCore.Statement<Element>>(
     wrappedValue: [Element] = [],
-    _ statement: S,
+    _ statement: sending S,
     database: (any DatabaseReader)? = nil
   )
   where
@@ -181,7 +181,7 @@ public struct FetchAll<Element: Sendable>: Sendable {
   ///   - database: The database to read from. A value of `nil` will use the default database
   ///     (`@Dependency(\.defaultDatabase)`).
   public func load<V: QueryRepresentable>(
-    _ statement: some StructuredQueriesCore.Statement<V>,
+    _ statement: sending some StructuredQueriesCore.Statement<V>,
     database: (any DatabaseReader)? = nil
   ) async throws
   where
@@ -249,7 +249,7 @@ extension FetchAll {
   ///     asynchronously on the main queue.
   public init<V: QueryRepresentable>(
     wrappedValue: [Element] = [],
-    _ statement: some StructuredQueriesCore.Statement<V>,
+    _ statement: sending some StructuredQueriesCore.Statement<V>,
     database: (any DatabaseReader)? = nil,
     scheduler: some ValueObservationScheduler & Hashable
   )
@@ -277,7 +277,7 @@ extension FetchAll {
   ///     asynchronously on the main queue.
   public init<S: StructuredQueriesCore.Statement<Element>>(
     wrappedValue: [Element] = [],
-    _ statement: S,
+    _ statement: sending S,
     database: (any DatabaseReader)? = nil,
     scheduler: some ValueObservationScheduler & Hashable
   )
@@ -327,7 +327,7 @@ extension FetchAll {
   ///   - scheduler: The scheduler to observe from. By default, database observation is performed
   ///     asynchronously on the main queue.
   public func load<V: QueryRepresentable>(
-    _ statement: some StructuredQueriesCore.Statement<V>,
+    _ statement: sending some StructuredQueriesCore.Statement<V>,
     database: (any DatabaseReader)? = nil,
     scheduler: some ValueObservationScheduler & Hashable
   ) async throws
@@ -411,7 +411,7 @@ extension FetchAll: Equatable where Element: Equatable {
     ///     the fetched results.
     public init<V: QueryRepresentable>(
       wrappedValue: [Element] = [],
-      _ statement: some StructuredQueriesCore.Statement<V>,
+      _ statement: sending some StructuredQueriesCore.Statement<V>,
       database: (any DatabaseReader)? = nil,
       animation: Animation
     )
@@ -437,7 +437,7 @@ extension FetchAll: Equatable where Element: Equatable {
     ///     the fetched results.
     public init<S: StructuredQueriesCore.Statement<Element>>(
       wrappedValue: [Element] = [],
-      _ statement: S,
+      _ statement: sending S,
       database: (any DatabaseReader)? = nil,
       animation: Animation
     )
@@ -485,7 +485,7 @@ extension FetchAll: Equatable where Element: Equatable {
     ///   - animation: The animation to use for user interface changes that result from changes to
     ///     the fetched results.
     public func load<V: QueryRepresentable>(
-      _ statement: some StructuredQueriesCore.Statement<V>,
+      _ statement: sending some StructuredQueriesCore.Statement<V>,
       database: (any DatabaseReader)? = nil,
       animation: Animation
     ) async throws
@@ -504,8 +504,11 @@ extension FetchAll: Equatable where Element: Equatable {
   }
 #endif
 
-private struct FetchAllStatementValueRequest<Value: QueryRepresentable>: StatementKeyRequest {
+private struct FetchAllStatementValueRequest<Value: QueryRepresentable>: StatementKeyRequest, @unchecked Sendable {
   let statement: any StructuredQueriesCore.Statement<Value>
+  init(statement: sending any StructuredQueriesCore.Statement<Value>) {
+    self.statement = statement
+  }
   func fetch(_ db: Database) throws -> [Value.QueryOutput] {
     try statement.fetchAll(db)
   }