Skip to content

Commit 95bd754

Browse files
committed
Rename withLatest(_:) to withLatest(from:)
1 parent 5a8fa35 commit 95bd754

File tree

4 files changed

+13
-13
lines changed

4 files changed

+13
-13
lines changed

Sources/Signal.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1036,7 +1036,7 @@ extension SignalProtocol {
10361036
/// sampled (possibly multiple times) by `self`, then terminate
10371037
/// once `self` has terminated. **`samplee`'s terminated events
10381038
/// are ignored**.
1039-
public func withLatest<U>(_ samplee: Signal<U, NoError>) -> Signal<(Value, U), Error> {
1039+
public func withLatest<U>(from samplee: Signal<U, NoError>) -> Signal<(Value, U), Error> {
10401040
return Signal { observer in
10411041
let state = Atomic<U?>(nil)
10421042
let disposable = CompositeDisposable()
@@ -1079,12 +1079,12 @@ extension SignalProtocol {
10791079
/// sampled (possibly multiple times) by `self`, then terminate
10801080
/// once `self` has terminated. **`samplee`'s terminated events
10811081
/// are ignored**.
1082-
public func withLatest<U>(_ samplee: SignalProducer<U, NoError>) -> Signal<(Value, U), Error> {
1082+
public func withLatest<U>(from samplee: SignalProducer<U, NoError>) -> Signal<(Value, U), Error> {
10831083
return Signal { observer in
10841084
let d = CompositeDisposable()
10851085
samplee.startWithSignal { signal, disposable in
10861086
d += disposable
1087-
d += self.withLatest(signal).observe(observer)
1087+
d += self.withLatest(from: signal).observe(observer)
10881088
}
10891089
return d
10901090
}

Sources/SignalProducer.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -827,7 +827,7 @@ extension SignalProducerProtocol {
827827
/// sampled (possibly multiple times) by `self`, then terminate
828828
/// once `self` has terminated. **`samplee`'s terminated events
829829
/// are ignored**.
830-
public func withLatest<U>(_ samplee: SignalProducer<U, NoError>) -> SignalProducer<(Value, U), Error> {
830+
public func withLatest<U>(from samplee: SignalProducer<U, NoError>) -> SignalProducer<(Value, U), Error> {
831831
return liftRight(Signal.withLatest)(samplee)
832832
}
833833

@@ -846,7 +846,7 @@ extension SignalProducerProtocol {
846846
/// sampled (possibly multiple times) by `self`, then terminate
847847
/// once `self` has terminated. **`samplee`'s terminated events
848848
/// are ignored**.
849-
public func withLatest<U>(_ samplee: Signal<U, NoError>) -> SignalProducer<(Value, U), Error> {
849+
public func withLatest<U>(from samplee: Signal<U, NoError>) -> SignalProducer<(Value, U), Error> {
850850
return lift(Signal.withLatest)(samplee)
851851
}
852852

Tests/ReactiveSwiftTests/SignalProducerLiftingSpec.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1114,15 +1114,15 @@ class SignalProducerLiftingSpec: QuickSpec {
11141114
}
11151115
}
11161116

1117-
describe("withLatest(signal)") {
1117+
describe("withLatest(from: signal)") {
11181118
var withLatestProducer: SignalProducer<(Int, String), NoError>!
11191119
var observer: Signal<Int, NoError>.Observer!
11201120
var sampleeObserver: Signal<String, NoError>.Observer!
11211121

11221122
beforeEach {
11231123
let (producer, incomingObserver) = SignalProducer<Int, NoError>.pipe()
11241124
let (samplee, incomingSampleeObserver) = Signal<String, NoError>.pipe()
1125-
withLatestProducer = producer.withLatest(samplee)
1125+
withLatestProducer = producer.withLatest(from: samplee)
11261126
observer = incomingObserver
11271127
sampleeObserver = incomingSampleeObserver
11281128
}
@@ -1180,15 +1180,15 @@ class SignalProducerLiftingSpec: QuickSpec {
11801180
}
11811181
}
11821182

1183-
describe("withLatest(producer)") {
1183+
describe("withLatest(from: producer)") {
11841184
var withLatestProducer: SignalProducer<(Int, String), NoError>!
11851185
var observer: Signal<Int, NoError>.Observer!
11861186
var sampleeObserver: Signal<String, NoError>.Observer!
11871187

11881188
beforeEach {
11891189
let (producer, incomingObserver) = SignalProducer<Int, NoError>.pipe()
11901190
let (samplee, incomingSampleeObserver) = SignalProducer<String, NoError>.pipe()
1191-
withLatestProducer = producer.withLatest(samplee)
1191+
withLatestProducer = producer.withLatest(from: samplee)
11921192
observer = incomingObserver
11931193
sampleeObserver = incomingSampleeObserver
11941194
}

Tests/ReactiveSwiftTests/SignalSpec.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1628,15 +1628,15 @@ class SignalSpec: QuickSpec {
16281628
}
16291629
}
16301630

1631-
describe("withLatest(signal)") {
1631+
describe("withLatest(from: signal)") {
16321632
var withLatestSignal: Signal<(Int, String), NoError>!
16331633
var observer: Signal<Int, NoError>.Observer!
16341634
var sampleeObserver: Signal<String, NoError>.Observer!
16351635

16361636
beforeEach {
16371637
let (signal, incomingObserver) = Signal<Int, NoError>.pipe()
16381638
let (samplee, incomingSampleeObserver) = Signal<String, NoError>.pipe()
1639-
withLatestSignal = signal.withLatest(samplee)
1639+
withLatestSignal = signal.withLatest(from: samplee)
16401640
observer = incomingObserver
16411641
sampleeObserver = incomingSampleeObserver
16421642
}
@@ -1697,15 +1697,15 @@ class SignalSpec: QuickSpec {
16971697
}
16981698
}
16991699

1700-
describe("withLatest(producer)") {
1700+
describe("withLatest(from: producer)") {
17011701
var withLatestSignal: Signal<(Int, String), NoError>!
17021702
var observer: Signal<Int, NoError>.Observer!
17031703
var sampleeObserver: Signal<String, NoError>.Observer!
17041704

17051705
beforeEach {
17061706
let (signal, incomingObserver) = Signal<Int, NoError>.pipe()
17071707
let (samplee, incomingSampleeObserver) = SignalProducer<String, NoError>.pipe()
1708-
withLatestSignal = signal.withLatest(samplee)
1708+
withLatestSignal = signal.withLatest(from: samplee)
17091709
observer = incomingObserver
17101710
sampleeObserver = incomingSampleeObserver
17111711
}

0 commit comments

Comments
 (0)