Skip to content

Commit fdad5fd

Browse files
committed
Merge remote-tracking branch 'lachenmayer/fix/remove-swift-async-algorithms-overlaps' into linux
2 parents 6f7f1c7 + ce1bf5d commit fdad5fd

22 files changed

+25
-3041
lines changed

Package.resolved

Lines changed: 11 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ let package = Package(
1919
dependencies: [
2020
.package(url: "https://github.com/apple/swift-collections.git", .upToNextMajor(from: "1.0.3")),
2121
.package(url: "https://github.com/OpenCombine/OpenCombine.git", from: "0.14.0"),
22+
.package(url: "https://github.com/apple/swift-async-algorithms.git", .upToNextMajor(from: "1.0.0")),
2223
],
2324
targets: [
2425
.target(
@@ -38,6 +39,7 @@ let package = Package(
3839
dependencies: [
3940
"AsyncExtensions",
4041
.product(name: "OpenCombine", package: "OpenCombine", condition: .when(platforms: [.linux])),
42+
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms")
4143
],
4244
path: "Tests"),
4345
]

README.md

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
**AsyncExtensions** provides a collection of operators that intends to ease the creation and combination of `AsyncSequences`.
1111

12-
**AsyncExtensions** can be seen as a companion to Apple [swift-async-algorithms](https://github.com/apple/swift-async-algorithms). For now there is an overlap between both libraries, but when **swift-async-algorithms** becomes stable the overlapping operators while be deprecated in **AsyncExtensions**. Nevertheless **AsyncExtensions** will continue to provide the operators that the community needs and are not provided by Apple.
12+
**AsyncExtensions** can be seen as a companion to Apple [swift-async-algorithms](https://github.com/apple/swift-async-algorithms), which provides operators that the community needs and are not provided by Apple.
1313

1414
## Adding AsyncExtensions as a Dependency
1515

@@ -44,11 +44,6 @@ AsyncStream)
4444
* [AsyncThrowingReplaySubject](./Sources/AsyncSubjects/AsyncThrowingReplaySubject.swift): Throwing subject with a shared output. Maintain an replays a buffered amount of values
4545

4646
### Combiners
47-
* [`zip(_:_:)`](./Sources/Combiners/Zip/AsyncZip2Sequence.swift): Zips two `AsyncSequence` into an AsyncSequence of tuple of elements
48-
* [`zip(_:_:_:)`](./Sources/Combiners/Zip/AsyncZip3Sequence.swift): Zips three `AsyncSequence` into an AsyncSequence of tuple of elements
49-
* [`zip(_:)`](./Sources/Combiners/Zip/AsyncZipSequence.swift): Zips any async sequences into an array of elements
50-
* [`merge(_:_:)`](./Sources/Combiners/Merge/AsyncMerge2Sequence.swift): Merges two `AsyncSequence` into an AsyncSequence of elements
51-
* [`merge(_:_:_:)`](./Sources/Combiners/Merge/AsyncMerge3Sequence.swift): Merges three `AsyncSequence` into an AsyncSequence of elements
5247
* [`merge(_:)`](./Sources/Combiners/Merge/AsyncMergeSequence.swift): Merges any `AsyncSequence` into an AsyncSequence of elements
5348
* [`withLatest(_:)`](./Sources/Combiners/WithLatestFrom/AsyncWithLatestFromSequence.swift): Combines elements from self with the last known element from an other `AsyncSequence`
5449
* [`withLatest(_:_:)`](./Sources/Combiners/WithLatestFrom/AsyncWithLatestFrom2Sequence.swift): Combines elements from self with the last known elements from two other async sequences
@@ -58,7 +53,6 @@ AsyncStream)
5853
* [AsyncFailSequence](./Sources/Creators/AsyncFailSequence.swift): Creates an `AsyncSequence` that immediately fails
5954
* [AsyncJustSequence](./Sources/Creators/AsyncJustSequence.swift): Creates an `AsyncSequence` that emits an element an finishes
6055
* [AsyncThrowingJustSequence](./Sources/Creators/AsyncThrowingJustSequence.swift): Creates an `AsyncSequence` that emits an elements and finishes bases on a throwing closure
61-
* [AsyncLazySequence](./Sources/Creators/AsyncLazySequence.swift): Creates an `AsyncSequence` of the elements from the base sequence
6256
* [AsyncTimerSequence](./Sources/Creators/AsyncTimerSequence.swift): Creates an `AsyncSequence` that emits a date value periodically
6357
* [AsyncStream Pipe](./Sources/Creators/AsyncStream+Pipe.swift): Creates an AsyncStream and returns a tuple standing for its inputs and outputs
6458

Sources/Combiners/Merge/AsyncMerge2Sequence.swift

Lines changed: 0 additions & 63 deletions
This file was deleted.

Sources/Combiners/Merge/AsyncMerge3Sequence.swift

Lines changed: 0 additions & 69 deletions
This file was deleted.

Sources/Combiners/Zip/AsyncZip2Sequence.swift

Lines changed: 0 additions & 61 deletions
This file was deleted.

Sources/Combiners/Zip/AsyncZip3Sequence.swift

Lines changed: 0 additions & 66 deletions
This file was deleted.

Sources/Combiners/Zip/AsyncZipSequence.swift

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)