Skip to content

Commit 85e6ad2

Browse files
committed
fix: remove overlapping operators from swift-async-algorithms
1 parent 1f0729e commit 85e6ad2

24 files changed

+30
-3349
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: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,10 @@ let package = Package(
1616
name: "AsyncExtensions",
1717
targets: ["AsyncExtensions"]),
1818
],
19-
dependencies: [.package(url: "https://github.com/apple/swift-collections.git", .upToNextMajor(from: "1.0.3"))],
19+
dependencies: [
20+
.package(url: "https://github.com/apple/swift-async-algorithms.git", .upToNextMajor(from: "1.0.0")),
21+
.package(url: "https://github.com/apple/swift-collections.git", .upToNextMajor(from: "1.0.3"))
22+
],
2023
targets: [
2124
.target(
2225
name: "AsyncExtensions",
@@ -32,7 +35,10 @@ let package = Package(
3235
),
3336
.testTarget(
3437
name: "AsyncExtensionsTests",
35-
dependencies: ["AsyncExtensions"],
38+
dependencies: [
39+
"AsyncExtensions",
40+
.product(name: "AsyncAlgorithms", package: "swift-async-algorithms")
41+
],
3642
path: "Tests"),
3743
]
3844
)

README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,12 +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
52-
* [`merge(_:)`](./Sources/Combiners/Merge/AsyncMergeSequence.swift): Merges any `AsyncSequence` into an AsyncSequence of elements
5347
* [`withLatest(_:)`](./Sources/Combiners/WithLatestFrom/AsyncWithLatestFromSequence.swift): Combines elements from self with the last known element from an other `AsyncSequence`
5448
* [`withLatest(_:_:)`](./Sources/Combiners/WithLatestFrom/AsyncWithLatestFrom2Sequence.swift): Combines elements from self with the last known elements from two other async sequences
5549

@@ -58,7 +52,6 @@ AsyncStream)
5852
* [AsyncFailSequence](./Sources/Creators/AsyncFailSequence.swift): Creates an `AsyncSequence` that immediately fails
5953
* [AsyncJustSequence](./Sources/Creators/AsyncJustSequence.swift): Creates an `AsyncSequence` that emits an element an finishes
6054
* [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
6255
* [AsyncTimerSequence](./Sources/Creators/AsyncTimerSequence.swift): Creates an `AsyncSequence` that emits a date value periodically
6356
* [AsyncStream Pipe](./Sources/Creators/AsyncStream+Pipe.swift): Creates an AsyncStream and returns a tuple standing for its inputs and outputs
6457

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/Merge/AsyncMergeSequence.swift

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

0 commit comments

Comments
 (0)