Skip to content

Commit

Permalink
Add merge implementation (#10)
Browse files Browse the repository at this point in the history
* Add merge implementation

* Add Merge3 and MergeMany

* Fix receive implementation

* Fix swift-docc doc warning

* Add merge test

* Update RemainingCombineInterface file

* Update README

* Update Merge implementation to fix test case issue

* Fix testNoDemandOnSubscriptionCrashes case
  • Loading branch information
Kyle-Ye authored Dec 26, 2023
1 parent 212f1ed commit e0963e6
Show file tree
Hide file tree
Showing 7 changed files with 2,170 additions and 483 deletions.
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ let package = Package(
],
swiftSettings: [
.unsafeFlags(["-enable-testing"]),
.define("WASI", .when(platforms: [.wasi]))
.define("WASI", .when(platforms: [.wasi])),
]
)
],
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# OpenCombine
[![codecov](https://codecov.io/gh/OpenSwiftUIProject/OpenCombine/branch/master/graph/badge.svg)](https://codecov.io/gh/OpenSwiftUIProject/OpenCombine)
[![codecov](https://codecov.io/gh/OpenSwiftUIProject/OpenCombine/graph/badge.svg?token=BJSI3J7RZQ)](https://codecov.io/gh/OpenSwiftUIProject/OpenCombine)
![Language](https://img.shields.io/badge/Swift-5.9-orange.svg)

Open-source implementation of Apple's [Combine](https://developer.apple.com/documentation/combine) framework for processing values over time.
Expand Down
480 changes: 0 additions & 480 deletions RemainingCombineInterface.swift

Large diffs are not rendered by default.

1,268 changes: 1,268 additions & 0 deletions Sources/OpenCombine/Publishers/Publishers.Merge.swift

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Sources/OpenCombine/Publishers/Publishers.Zip.swift
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
//
//
// Created by Kyle on 2023/7/25.
// Audited for Combine 2023

#if canImport(COpenCombineHelpers)
import COpenCombineHelpers
Expand Down
2 changes: 1 addition & 1 deletion Sources/OpenCombine/Subscribers/Subscribers.Demand.swift
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,7 @@ extension Subscribers {

/// Creates a demand instance from a decoder.
///
/// - Parameter decoder: The decoder of a previously-encoded ``Subscribers.Demand``
/// - Parameter decoder: The decoder of a previously-encoded ``Subscribers/Demand``
/// instance.
public init(from decoder: Decoder) throws {
try self.init(rawValue: decoder.singleValueContainer().decode(UInt.self))
Expand Down
Loading

0 comments on commit e0963e6

Please sign in to comment.