Skip to content

Commit a363981

Browse files
Updated TypedAsyncSequence to be implicitly Sendable
1 parent 12ad8c4 commit a363981

2 files changed

Lines changed: 22 additions & 22 deletions

File tree

Sources/CodableDatastore/Datastore/Datastore.swift

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -520,7 +520,7 @@ extension Datastore {
520520
range identifierRange: some IndexRangeExpression<IdentifierType>,
521521
order: RangeOrder,
522522
awaitWarmup: Bool
523-
) -> some TypedAsyncSequence<(id: IdentifierType, instance: InstanceType)> & Sendable {
523+
) -> some TypedAsyncSequence<(id: IdentifierType, instance: InstanceType)> {
524524
AsyncThrowingBackpressureStream { provider in
525525
if awaitWarmup {
526526
try await self.warmupIfNeeded()
@@ -558,7 +558,7 @@ extension Datastore {
558558
public nonisolated func load(
559559
range identifierRange: some IndexRangeExpression<IdentifierType>,
560560
order: RangeOrder = .ascending
561-
) -> some TypedAsyncSequence<InstanceType> & Sendable where IdentifierType: RangedIndexable {
561+
) -> some TypedAsyncSequence<InstanceType> where IdentifierType: RangedIndexable {
562562
_load(range: identifierRange, order: order, awaitWarmup: true)
563563
.map { $0.instance }
564564
}
@@ -575,7 +575,7 @@ extension Datastore {
575575
public nonisolated func load(
576576
_ identifierRange: some IndexRangeExpression<IdentifierType>,
577577
order: RangeOrder = .ascending
578-
) -> some TypedAsyncSequence<InstanceType> & Sendable where IdentifierType: RangedIndexable {
578+
) -> some TypedAsyncSequence<InstanceType> where IdentifierType: RangedIndexable {
579579
load(range: identifierRange, order: order)
580580
}
581581

@@ -591,7 +591,7 @@ extension Datastore {
591591
public nonisolated func load(
592592
range identifierRange: IndexRange<IdentifierType>,
593593
order: RangeOrder = .ascending
594-
) -> some TypedAsyncSequence<InstanceType> & Sendable where IdentifierType: RangedIndexable {
594+
) -> some TypedAsyncSequence<InstanceType> where IdentifierType: RangedIndexable {
595595
load(range: identifierRange, order: order)
596596
}
597597

@@ -608,7 +608,7 @@ extension Datastore {
608608
public nonisolated func load(
609609
_ identifierRange: IndexRange<IdentifierType>,
610610
order: RangeOrder = .ascending
611-
) -> some TypedAsyncSequence<InstanceType> & Sendable where IdentifierType: RangedIndexable {
611+
) -> some TypedAsyncSequence<InstanceType> where IdentifierType: RangedIndexable {
612612
load(range: identifierRange, order: order)
613613
}
614614

@@ -622,7 +622,7 @@ extension Datastore {
622622
public nonisolated func load(
623623
range unboundedRange: Swift.UnboundedRange,
624624
order: RangeOrder = .ascending
625-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
625+
) -> some TypedAsyncSequence<InstanceType> {
626626
_load(range: IndexRange.unbounded, order: order, awaitWarmup: true)
627627
.map { $0.instance }
628628
}
@@ -639,7 +639,7 @@ extension Datastore {
639639
public nonisolated func load(
640640
_ unboundedRange: Swift.UnboundedRange,
641641
order: RangeOrder = .ascending
642-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
642+
) -> some TypedAsyncSequence<InstanceType> {
643643
load(range: ..., order: order)
644644
}
645645

@@ -657,7 +657,7 @@ extension Datastore {
657657
index: KeyPath<Format, Index>,
658658
range: some IndexRangeExpression<Bound>,
659659
order: RangeOrder = .ascending
660-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
660+
) -> some TypedAsyncSequence<InstanceType> {
661661
let declaredIndex = self.indexRepresentations[AnyIndexRepresentation(indexRepresentation: self.format[keyPath: index])]
662662

663663
return AsyncThrowingBackpressureStream { provider in
@@ -723,7 +723,7 @@ extension Datastore {
723723
index: KeyPath<Format, Index>,
724724
value: Value,
725725
order: RangeOrder = .ascending
726-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
726+
) -> some TypedAsyncSequence<InstanceType> {
727727
_load(index: index, range: IndexRange(only: value), order: order)
728728
}
729729

@@ -745,7 +745,7 @@ extension Datastore {
745745
_ value: Value,
746746
order: RangeOrder = .ascending,
747747
from index: KeyPath<Format, Index>
748-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
748+
) -> some TypedAsyncSequence<InstanceType> {
749749
load(index: index, value: value, order: order)
750750
}
751751

@@ -802,7 +802,7 @@ extension Datastore {
802802
index: KeyPath<Format, Index>,
803803
range: some IndexRangeExpression<Value>,
804804
order: RangeOrder = .ascending
805-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
805+
) -> some TypedAsyncSequence<InstanceType> {
806806
_load(index: index, range: range, order: order)
807807
}
808808

@@ -825,7 +825,7 @@ extension Datastore {
825825
_ range: some IndexRangeExpression<Value>,
826826
order: RangeOrder = .ascending,
827827
from index: KeyPath<Format, Index>
828-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
828+
) -> some TypedAsyncSequence<InstanceType> {
829829
load(index: index, range: range, order: order)
830830
}
831831

@@ -847,7 +847,7 @@ extension Datastore {
847847
index: KeyPath<Format, Index>,
848848
range: IndexRange<Value>,
849849
order: RangeOrder = .ascending
850-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
850+
) -> some TypedAsyncSequence<InstanceType> {
851851
_load(index: index, range: range, order: order)
852852
}
853853

@@ -871,7 +871,7 @@ extension Datastore {
871871
_ range: IndexRange<Value>,
872872
order: RangeOrder = .ascending,
873873
from index: KeyPath<Format, Index>
874-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
874+
) -> some TypedAsyncSequence<InstanceType> {
875875
load(index: index, range: range, order: order)
876876
}
877877

@@ -889,7 +889,7 @@ extension Datastore {
889889
index: KeyPath<Format, Index>,
890890
range unboundedRange: Swift.UnboundedRange,
891891
order: RangeOrder = .ascending
892-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
892+
) -> some TypedAsyncSequence<InstanceType> {
893893
_load(index: index, range: IndexRange.unbounded, order: order)
894894
}
895895

@@ -908,7 +908,7 @@ extension Datastore {
908908
_ unboundedRange: Swift.UnboundedRange,
909909
order: RangeOrder = .ascending,
910910
from index: KeyPath<Format, Index>
911-
) -> some TypedAsyncSequence<InstanceType> & Sendable {
911+
) -> some TypedAsyncSequence<InstanceType> {
912912
load(index: index, range: ..., order: order)
913913
}
914914
}
@@ -922,7 +922,7 @@ extension Datastore {
922922
/// - Returns: An unbounded asynchronous sequence reporting changes to the observed instance.
923923
public func observe(
924924
id identifier: IdentifierType
925-
) async throws -> some TypedAsyncSequence<ObservedEvent<IdentifierType, InstanceType>> & Sendable {
925+
) async throws -> some TypedAsyncSequence<ObservedEvent<IdentifierType, InstanceType>> {
926926
try await observe().filter { $0.id == identifier }
927927
}
928928

@@ -934,14 +934,14 @@ extension Datastore {
934934
@inlinable
935935
public func observe(
936936
_ identifier: IdentifierType
937-
) async throws -> some TypedAsyncSequence<ObservedEvent<IdentifierType, InstanceType>> & Sendable {
937+
) async throws -> some TypedAsyncSequence<ObservedEvent<IdentifierType, InstanceType>> {
938938
try await observe(id: identifier)
939939
}
940940

941941
/// Observe all changes made to a datastore.
942942
///
943943
/// - Returns: An unbounded asynchronous sequence reporting changes to the datastore.
944-
public func observe() async throws -> some TypedAsyncSequence<ObservedEvent<IdentifierType, InstanceType>> & Sendable {
944+
public func observe() async throws -> some TypedAsyncSequence<ObservedEvent<IdentifierType, InstanceType>> {
945945
try await warmupIfNeeded()
946946

947947
return try await persistence._withTransaction(
@@ -1414,7 +1414,7 @@ extension Datastore where InstanceType: Identifiable, IdentifierType == Instance
14141414
@inlinable
14151415
public func observe(
14161416
instance: InstanceType
1417-
) async throws -> some TypedAsyncSequence<ObservedEvent<IdentifierType, InstanceType>> & Sendable {
1417+
) async throws -> some TypedAsyncSequence<ObservedEvent<IdentifierType, InstanceType>> {
14181418
try await observe(id: instance.id)
14191419
}
14201420

@@ -1427,7 +1427,7 @@ extension Datastore where InstanceType: Identifiable, IdentifierType == Instance
14271427
@inlinable
14281428
public func observe(
14291429
_ instance: InstanceType
1430-
) async throws -> some TypedAsyncSequence<ObservedEvent<IdentifierType, InstanceType>> & Sendable {
1430+
) async throws -> some TypedAsyncSequence<ObservedEvent<IdentifierType, InstanceType>> {
14311431
try await observe(instance: instance)
14321432
}
14331433
}

Sources/CodableDatastore/Datastore/TypedAsyncSequence.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// Copyright © 2023-24 Mochi Development, Inc. All rights reserved.
77
//
88

9-
public protocol TypedAsyncSequence<Element>: AsyncSequence {}
9+
public protocol TypedAsyncSequence<Element>: AsyncSequence, Sendable {}
1010

1111
// MARK: - Standard Library Conformances
1212

0 commit comments

Comments
 (0)