Skip to content

Commit 026ed0d

Browse files
authored
Adopt AsyncAlgorithms (#167)
# Motivation Now that `swift-async-algorithms` has a `1.0.0` tag we can depend on it instead of shipping our own version of `merge`.
1 parent d673fdc commit 026ed0d

File tree

8 files changed

+7
-1432
lines changed

8 files changed

+7
-1432
lines changed

Package.swift

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ let package = Package(
3434
from: "1.0.0"
3535
),
3636
.package(
37-
url: "https://github.com/apple/swift-collections.git",
37+
url: "https://github.com/apple/swift-async-algorithms.git",
3838
from: "1.0.0"
3939
),
4040
],
@@ -46,7 +46,10 @@ let package = Package(
4646
name: "Logging",
4747
package: "swift-log"
4848
),
49-
.target(name: "_AsyncMergeSequence"),
49+
.product(
50+
name: "AsyncAlgorithms",
51+
package: "swift-async-algorithms"
52+
),
5053
.target(name: "UnixSignals"),
5154
.target(name: "ConcurrencyHelpers"),
5255
]
@@ -66,15 +69,6 @@ let package = Package(
6669
.target(
6770
name: "ConcurrencyHelpers"
6871
),
69-
.target(
70-
name: "_AsyncMergeSequence",
71-
dependencies: [
72-
.product(
73-
name: "DequeModule",
74-
package: "swift-collections"
75-
),
76-
]
77-
),
7872
.testTarget(
7973
name: "ServiceLifecycleTests",
8074
dependencies: [

Sources/ServiceLifecycle/AsyncCancelOnGracefulShutdownSequence.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
//
1313
//===----------------------------------------------------------------------===//
1414

15-
import _AsyncMergeSequence
15+
import AsyncAlgorithms
1616

1717
extension AsyncSequence where Self: Sendable, Element: Sendable {
1818
/// Creates an asynchronous sequence that is cancelled once graceful shutdown has triggered.
@@ -44,7 +44,7 @@ public struct AsyncCancelOnGracefulShutdownSequence<Base: AsyncSequence & Sendab
4444

4545
@inlinable
4646
public init(base: Base) {
47-
self._merge = .init(
47+
self._merge = merge(
4848
base.mapNil().map { .base($0) },
4949
AsyncGracefulShutdownSequence().mapNil().map { _ in .gracefulShutdown }
5050
)

Sources/_AsyncMergeSequence/Locking.swift

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

Sources/_AsyncMergeSequence/Merge/AsyncMerge2Sequence.swift

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

0 commit comments

Comments
 (0)