Skip to content

Move Signal and SignalProducer operators to the concrete types. #304

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 31, 2017
Merged

Move Signal and SignalProducer operators to the concrete types. #304

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b58d89f
Move all operators to the concrete types.
andersio Mar 30, 2017
3acab53
Revert a few overloads to the protocol to mitigate an overloading issue.
andersio Mar 30, 2017
6d5331a
Remove unnecessary requirements from `Signal[Producer]Protocol`.
andersio Mar 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Sources/Deprecations+Removals.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@ public protocol BindingTargetProtocol {}
public protocol AtomicProtocol {}

// MARK: Depreciated types in ReactiveSwift 1.x.
extension SignalProtocol where Value == Bool {
extension Signal where Value == Bool {
@available(*, deprecated, renamed: "negate()")
public var negated: Signal<Bool, Error> {
return negate()
}
}

extension SignalProducerProtocol where Value == Bool {
extension SignalProducer where Value == Bool {
@available(*, deprecated, renamed: "negate()")
public var negated: SignalProducer<Bool, Error> {
return negate()
Expand Down Expand Up @@ -223,7 +223,7 @@ extension Observer {
public func sendFailed(_ error: Error) { fatalError() }
}

extension SignalProtocol {
extension Signal {
@available(*, unavailable, renamed:"take(first:)")
public func take(_ count: Int) -> Signal<Value, Error> { fatalError() }

Expand Down Expand Up @@ -264,24 +264,24 @@ extension SignalProtocol {
public func observeNext(_ next: (Value) -> Void) -> Disposable? { fatalError() }
}

extension SignalProtocol where Value: OptionalProtocol {
extension Signal where Value: OptionalProtocol {
@available(*, unavailable, renamed:"skipNil()")
public func ignoreNil() -> SignalProducer<Value.Wrapped, Error> { fatalError() }
}

extension SignalProtocol where Error == NoError {
extension Signal where Error == NoError {
@available(*, unavailable, renamed: "observeValues")
public func observeNext(_ next: (Value) -> Void) -> Disposable? { fatalError() }
}

extension SignalProtocol where Value: Sequence {
extension Signal where Value: Sequence {
@available(*, deprecated, message: "Use flatten() instead")
public func flatten(_ strategy: FlattenStrategy) -> Signal<Value.Iterator.Element, Error> {
return self.flatMap(strategy, transform: SignalProducer.init)
}
}

extension SignalProducerProtocol {
extension SignalProducer {
@available(*, unavailable, renamed:"take(first:)")
public func take(_ count: Int) -> SignalProducer<Value, Error> { fatalError() }

Expand Down Expand Up @@ -346,20 +346,20 @@ extension SignalProducerProtocol {
public func times(_ count: Int) -> SignalProducer<Value, Error> { fatalError() }
}

extension SignalProducerProtocol where Value: OptionalProtocol {
extension SignalProducer where Value: OptionalProtocol {
@available(*, unavailable, renamed:"skipNil()")
public func ignoreNil() -> SignalProducer<Value.Wrapped, Error> { fatalError() }
}

extension SignalProducerProtocol where Error == NoError {
extension SignalProducer where Error == NoError {
@available(*, unavailable, renamed: "startWithValues")
public func startWithNext(_ value: @escaping (Value) -> Void) -> Disposable { fatalError() }
}

extension SignalProducerProtocol where Value: Sequence {
extension SignalProducer where Value: Sequence {
@available(*, deprecated, message: "Use flatten() instead")
public func flatten(_ strategy: FlattenStrategy) -> SignalProducer<Value.Iterator.Element, Error> {
return self.flatMap(strategy, transform: SignalProducer.init)
return self.flatMap(strategy, transform: SignalProducer<Value.Iterator.Element, NoError>.init)
}
}

Expand Down
4 changes: 2 additions & 2 deletions Sources/EventLogger.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public typealias EventLogger = (
_ lineNumber: Int
) -> Void

extension SignalProtocol {
extension Signal {
/// Logs all events that the receiver sends. By default, it will print to
/// the standard output.
///
Expand Down Expand Up @@ -78,7 +78,7 @@ extension SignalProtocol {
}
}

extension SignalProducerProtocol {
extension SignalProducer {
/// Logs all events that the receiver sends. By default, it will print to
/// the standard output.
///
Expand Down
Loading