Skip to content

Commit

Permalink
Rename SignalProducer(signal:) to SignalProducer(_:).
Browse files Browse the repository at this point in the history
  • Loading branch information
andersio committed Nov 25, 2016
1 parent d4fb070 commit 024b9e1
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 11 deletions.
3 changes: 3 additions & 0 deletions Sources/Deprecations+Removals.swift
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,9 @@ extension SignalProducerProtocol where Error == NoError {
extension SignalProducer {
@available(*, unavailable, message:"Use properties instead. `buffer(_:)` is removed in RAC 5.0.")
public static func buffer(_ capacity: Int) -> (SignalProducer, Signal<Value, Error>.Observer) { fatalError() }

@available(*, unavailable, renamed:"init(_:)")
public init<S: SignalProtocol>(signal: S) where S.Value == Value, S.Error == Error { fatalError() }
}

extension PropertyProtocol {
Expand Down
2 changes: 1 addition & 1 deletion Sources/Property.swift
Original file line number Diff line number Diff line change
Expand Up @@ -448,7 +448,7 @@ public final class Property<Value>: PropertyProtocol {
/// - initialValue: Starting value for the property.
/// - signal: A signal that will send values to the property.
public convenience init(initial: Value, then signal: Signal<Value, NoError>) {
self.init(unsafeProducer: SignalProducer(signal: signal).prefix(value: initial),
self.init(unsafeProducer: SignalProducer(signal).prefix(value: initial),
capturing: [])
}

Expand Down
2 changes: 1 addition & 1 deletion Sources/SignalProducer.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public struct SignalProducer<Value, Error: Swift.Error> {
///
/// - parameters:
/// - signal: A signal to observe after starting the producer.
public init<S: SignalProtocol>(signal: S) where S.Value == Value, S.Error == Error {
public init<S: SignalProtocol>(_ signal: S) where S.Value == Value, S.Error == Error {
self.init { observer, disposable in
disposable += signal.observe(observer)
}
Expand Down
4 changes: 2 additions & 2 deletions Tests/ReactiveSwiftTests/PropertySpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -494,7 +494,7 @@ class PropertySpec: QuickSpec {

let (signal, observer) = Signal<Int, NoError>.pipe()
var property: Property<Int>? = Property(initial: 1,
then: SignalProducer(signal: signal))
then: SignalProducer(signal))
let propertySignal = property!.signal

propertySignal.observeCompleted { signalCompleted = true }
Expand Down Expand Up @@ -1484,7 +1484,7 @@ class PropertySpec: QuickSpec {

it("should tear down the binding when the property deallocates") {
let (signal, _) = Signal<String, NoError>.pipe()
let signalProducer = SignalProducer(signal: signal)
let signalProducer = SignalProducer(signal)

var mutableProperty: MutableProperty<String>? = MutableProperty(initialPropertyValue)

Expand Down
14 changes: 7 additions & 7 deletions Tests/ReactiveSwiftTests/SignalProducerSpec.swift
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ class SignalProducerSpec: QuickSpec {
}

it("should emit values then complete") {
let producer = SignalProducer<Int, TestError>(signal: signal)
let producer = SignalProducer<Int, TestError>(signal)

var values: [Int] = []
var error: TestError?
Expand Down Expand Up @@ -174,7 +174,7 @@ class SignalProducerSpec: QuickSpec {
}

it("should emit error") {
let producer = SignalProducer<Int, TestError>(signal: signal)
let producer = SignalProducer<Int, TestError>(signal)

var error: TestError?
let sentError = TestError.default
Expand Down Expand Up @@ -1774,7 +1774,7 @@ class SignalProducerSpec: QuickSpec {
forwardingScheduler = QueueScheduler(queue: DispatchQueue(label: "\(#file):\(#line)"))
}

let producer = SignalProducer(signal: _signal.delay(0.1, on: forwardingScheduler))
let producer = SignalProducer(_signal.delay(0.1, on: forwardingScheduler))

let observingScheduler: QueueScheduler

Expand Down Expand Up @@ -1823,7 +1823,7 @@ class SignalProducerSpec: QuickSpec {
forwardingScheduler = QueueScheduler(queue: DispatchQueue(label: "\(#file):\(#line)"))
}

let producer = SignalProducer(signal: _signal.delay(0.1, on: forwardingScheduler))
let producer = SignalProducer(_signal.delay(0.1, on: forwardingScheduler))

let observingScheduler: QueueScheduler

Expand Down Expand Up @@ -1875,7 +1875,7 @@ class SignalProducerSpec: QuickSpec {
} else {
scheduler = QueueScheduler(queue: DispatchQueue(label: "\(#file):\(#line)"))
}
let producer = SignalProducer(signal: _signal.delay(0.1, on: scheduler))
let producer = SignalProducer(_signal.delay(0.1, on: scheduler))

var result: Result<Int, NoError>?

Expand Down Expand Up @@ -1928,7 +1928,7 @@ class SignalProducerSpec: QuickSpec {
} else {
scheduler = QueueScheduler(queue: DispatchQueue(label: "\(#file):\(#line)"))
}
let producer = SignalProducer(signal: _signal.delay(0.1, on: scheduler))
let producer = SignalProducer(_signal.delay(0.1, on: scheduler))

var result: Result<(), NoError>?

Expand Down Expand Up @@ -2356,7 +2356,7 @@ class SignalProducerSpec: QuickSpec {
extension SignalProducer {
internal static func pipe() -> (SignalProducer, ProducedSignal.Observer) {
let (signal, observer) = ProducedSignal.pipe()
let producer = SignalProducer(signal: signal)
let producer = SignalProducer(signal)
return (producer, observer)
}

Expand Down

0 comments on commit 024b9e1

Please sign in to comment.