Skip to content

Commit e00f650

Browse files
jspahrsummersjspahrsummers
committed
Remove nil checks before invoking -addDisposable:
1 parent dd19bf7 commit e00f650

9 files changed

+28
-28
lines changed

Diff for: ‎Documentation/DesignGuidelines.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ and cause a crash:
696696
resubscribe();
697697
}];
698698

699-
if (disposable != nil) [compoundDisposable addDisposable:disposable];
699+
[compoundDisposable addDisposable:disposable];
700700
};
701701

702702
return compoundDisposable;
@@ -721,10 +721,10 @@ By contrast, this version will avoid a stack overflow:
721721
reschedule();
722722
}];
723723

724-
if (disposable != nil) [compoundDisposable addDisposable:disposable];
724+
[compoundDisposable addDisposable:disposable];
725725
}];
726726

727-
if (disposable != nil) [compoundDisposable addDisposable:disposable];
727+
[compoundDisposable addDisposable:disposable];
728728
return compoundDisposable;
729729
}];
730730
}

Diff for: ‎ReactiveCocoaFramework/ReactiveCocoa/RACDynamicSignal.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -176,10 +176,10 @@ - (RACDisposable *)subscribe:(id<RACSubscriber>)subscriber {
176176
if (self.didSubscribe != NULL) {
177177
RACDisposable *schedulingDisposable = [RACScheduler.subscriptionScheduler schedule:^{
178178
RACDisposable *innerDisposable = self.didSubscribe(subscriber);
179-
if (innerDisposable != nil) [disposable addDisposable:innerDisposable];
179+
[disposable addDisposable:innerDisposable];
180180
}];
181181

182-
if (schedulingDisposable != nil) [disposable addDisposable:schedulingDisposable];
182+
[disposable addDisposable:schedulingDisposable];
183183
}
184184

185185
return disposable;

Diff for: ‎ReactiveCocoaFramework/ReactiveCocoa/RACPassthroughSubscriber.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ - (void)sendCompleted {
9595
}
9696

9797
- (void)didSubscribeWithDisposable:(RACDisposable *)disposable {
98-
if (disposable != nil && disposable != self.disposable) {
98+
if (disposable != self.disposable) {
9999
[self.disposable addDisposable:disposable];
100100
}
101101
}

Diff for: ‎ReactiveCocoaFramework/ReactiveCocoa/RACReplaySubject.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ - (RACDisposable *)subscribe:(id<RACSubscriber>)subscriber {
7676
}
7777
}];
7878

79-
if (schedulingDisposable != nil) [compoundDisposable addDisposable:schedulingDisposable];
79+
[compoundDisposable addDisposable:schedulingDisposable];
8080

8181
return compoundDisposable;
8282
}

Diff for: ‎ReactiveCocoaFramework/ReactiveCocoa/RACScheduler.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ - (void)scheduleRecursiveBlock:(RACSchedulerRecursiveBlock)recursiveBlock adding
184184
}
185185
}];
186186

187-
if (schedulingDisposable != nil) [selfDisposable addDisposable:schedulingDisposable];
187+
[selfDisposable addDisposable:schedulingDisposable];
188188
}
189189
}
190190

Diff for: ‎ReactiveCocoaFramework/ReactiveCocoa/RACSignal+Operations.m

+16-16
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
recurse();
6969
}];
7070

71-
if (subscriptionDisposable != nil) [selfDisposable addDisposable:subscriptionDisposable];
71+
[selfDisposable addDisposable:subscriptionDisposable];
7272
};
7373

7474
// Subscribe once immediately, and then use recursive scheduling for any
@@ -77,7 +77,7 @@
7777
RACScheduler *recursiveScheduler = RACScheduler.currentScheduler ?: [RACScheduler scheduler];
7878

7979
RACDisposable *schedulingDisposable = [recursiveScheduler scheduleRecursiveBlock:recursiveBlock];
80-
if (schedulingDisposable != nil) [compoundDisposable addDisposable:schedulingDisposable];
80+
[compoundDisposable addDisposable:schedulingDisposable];
8181
});
8282

8383
return compoundDisposable;
@@ -189,7 +189,7 @@ - (RACSignal *)throttle:(NSTimeInterval)interval valuesPassingTest:(BOOL (^)(id
189189
[subscriber sendCompleted];
190190
}];
191191

192-
if (subscriptionDisposable != nil) [compoundDisposable addDisposable:subscriptionDisposable];
192+
[compoundDisposable addDisposable:subscriptionDisposable];
193193
return compoundDisposable;
194194
}] setNameWithFormat:@"[%@] -throttle: %f valuesPassingTest:", self.name, (double)interval];
195195
}
@@ -205,7 +205,7 @@ - (RACSignal *)delay:(NSTimeInterval)interval {
205205
void (^schedule)(dispatch_block_t) = ^(dispatch_block_t block) {
206206
RACScheduler *delayScheduler = RACScheduler.currentScheduler ?: scheduler;
207207
RACDisposable *schedulerDisposable = [delayScheduler afterDelay:interval schedule:block];
208-
if (schedulerDisposable != nil) [disposable addDisposable:schedulerDisposable];
208+
[disposable addDisposable:schedulerDisposable];
209209
};
210210

211211
RACDisposable *subscriptionDisposable = [self subscribeNext:^(id x) {
@@ -220,7 +220,7 @@ - (RACSignal *)delay:(NSTimeInterval)interval {
220220
});
221221
}];
222222

223-
if (subscriptionDisposable != nil) [disposable addDisposable:subscriptionDisposable];
223+
[disposable addDisposable:subscriptionDisposable];
224224
return disposable;
225225
}] setNameWithFormat:@"[%@] -delay: %f", self.name, (double)interval];
226226
}
@@ -422,7 +422,7 @@ - (RACSignal *)combineLatestWith:(RACSignal *)signal {
422422
}
423423
}];
424424

425-
if (selfDisposable != nil) [disposable addDisposable:selfDisposable];
425+
[disposable addDisposable:selfDisposable];
426426

427427
RACDisposable *otherDisposable = [signal subscribeNext:^(id x) {
428428
@synchronized (disposable) {
@@ -438,7 +438,7 @@ - (RACSignal *)combineLatestWith:(RACSignal *)signal {
438438
}
439439
}];
440440

441-
if (otherDisposable != nil) [disposable addDisposable:otherDisposable];
441+
[disposable addDisposable:otherDisposable];
442442

443443
return disposable;
444444
}] setNameWithFormat:@"[%@] -combineLatestWith: %@", self.name, signal];
@@ -528,7 +528,7 @@ - (RACSignal *)flatten:(NSUInteger)maxConcurrent {
528528
[compoundDisposable removeDisposable:disposable];
529529
}];
530530

531-
if (disposable != nil) [compoundDisposable addDisposable:disposable];
531+
[compoundDisposable addDisposable:disposable];
532532
return NO;
533533
};
534534

@@ -567,7 +567,7 @@ - (RACSignal *)flatten:(NSUInteger)maxConcurrent {
567567
}
568568
}];
569569

570-
if (disposable != nil) [compoundDisposable addDisposable:disposable];
570+
[compoundDisposable addDisposable:disposable];
571571
return compoundDisposable;
572572
}] setNameWithFormat:@"[%@] -flatten: %lu", self.name, (unsigned long)maxConcurrent];
573573
}
@@ -642,7 +642,7 @@ - (RACDisposable *)setKeyPath:(NSString *)keyPath onObject:(NSObject *)object ni
642642
[disposable dispose];
643643
}];
644644

645-
if (subscriptionDisposable != nil) [disposable addDisposable:subscriptionDisposable];
645+
[disposable addDisposable:subscriptionDisposable];
646646

647647
#if DEBUG
648648
static void *bindingsKey = &bindingsKey;
@@ -718,7 +718,7 @@ - (RACSignal *)takeUntil:(RACSignal *)signalTrigger {
718718
triggerCompletion();
719719
}];
720720

721-
if (triggerDisposable != nil) [disposable addDisposable:triggerDisposable];
721+
[disposable addDisposable:triggerDisposable];
722722

723723
RACDisposable *selfDisposable = [self subscribeNext:^(id x) {
724724
[subscriber sendNext:x];
@@ -729,7 +729,7 @@ - (RACSignal *)takeUntil:(RACSignal *)signalTrigger {
729729
[subscriber sendCompleted];
730730
}];
731731

732-
if (selfDisposable != nil) [disposable addDisposable:selfDisposable];
732+
[disposable addDisposable:selfDisposable];
733733

734734
return disposable;
735735
}] setNameWithFormat:@"[%@] -takeUntil: %@", self.name, signalTrigger];
@@ -945,7 +945,7 @@ - (RACSignal *)timeout:(NSTimeInterval)interval onScheduler:(RACScheduler *)sche
945945
[subscriber sendError:[NSError errorWithDomain:RACSignalErrorDomain code:RACSignalErrorTimedOut userInfo:nil]];
946946
}];
947947

948-
if (timeoutDisposable != nil) [disposable addDisposable:timeoutDisposable];
948+
[disposable addDisposable:timeoutDisposable];
949949

950950
RACDisposable *subscriptionDisposable = [self subscribeNext:^(id x) {
951951
[subscriber sendNext:x];
@@ -957,7 +957,7 @@ - (RACSignal *)timeout:(NSTimeInterval)interval onScheduler:(RACScheduler *)sche
957957
[subscriber sendCompleted];
958958
}];
959959

960-
if (subscriptionDisposable != nil) [disposable addDisposable:subscriptionDisposable];
960+
[disposable addDisposable:subscriptionDisposable];
961961
return disposable;
962962
}] setNameWithFormat:@"[%@] -timeout: %f", self.name, (double)interval];
963963
}
@@ -993,10 +993,10 @@ - (RACSignal *)subscribeOn:(RACScheduler *)scheduler {
993993
[subscriber sendCompleted];
994994
}];
995995

996-
if (subscriptionDisposable != nil) [disposable addDisposable:subscriptionDisposable];
996+
[disposable addDisposable:subscriptionDisposable];
997997
}];
998998

999-
if (schedulingDisposable != nil) [disposable addDisposable:schedulingDisposable];
999+
[disposable addDisposable:schedulingDisposable];
10001000
return disposable;
10011001
}] setNameWithFormat:@"[%@] -subscribeOn: %@", self.name, scheduler];
10021002
}

Diff for: ‎ReactiveCocoaFramework/ReactiveCocoa/RACSubject.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ - (void)sendCompleted {
111111
}
112112

113113
- (void)didSubscribeWithDisposable:(RACDisposable *)d {
114-
if (d != nil) [self.disposable addDisposable:d];
114+
[self.disposable addDisposable:d];
115115
}
116116

117117
@end

Diff for: ‎ReactiveCocoaFramework/ReactiveCocoa/RACSubscriber.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ - (void)sendCompleted {
9595
}
9696

9797
- (void)didSubscribeWithDisposable:(RACDisposable *)d {
98-
if (d != nil) [self.disposable addDisposable:d];
98+
[self.disposable addDisposable:d];
9999
}
100100

101101
@end

Diff for: ‎ReactiveCocoaFramework/ReactiveCocoa/RACTestScheduler.m

+2-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ - (RACDisposable *)after:(NSDate *)date repeatingEvery:(NSTimeInterval)interval
179179

180180
// Schedule the next interval.
181181
RACDisposable *schedulingDisposable = [self after:[date dateByAddingTimeInterval:interval] repeatingEvery:interval withLeeway:leeway schedule:block];
182-
if (schedulingDisposable != nil) [compoundDisposable addDisposable:schedulingDisposable];
182+
[compoundDisposable addDisposable:schedulingDisposable];
183183

184184
block();
185185
};
@@ -188,7 +188,7 @@ - (RACDisposable *)after:(NSDate *)date repeatingEvery:(NSTimeInterval)interval
188188
CFBinaryHeapAddValue(self.scheduledActions, (__bridge void *)action);
189189

190190
thisDisposable = action.disposable;
191-
if (thisDisposable != nil) [compoundDisposable addDisposable:thisDisposable];
191+
[compoundDisposable addDisposable:thisDisposable];
192192
}
193193

194194
return compoundDisposable;

0 commit comments

Comments
 (0)