Skip to content

Commit d7263d0

Browse files
committed
zip should use RACGenericReduceBlock. Reduce blocks are mandatory.
1 parent d364c8d commit d7263d0

File tree

4 files changed

+7
-7
lines changed

4 files changed

+7
-7
lines changed

ReactiveObjC/RACSignal+Operations.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ + (RACSignal *)combineLatest:(id<NSFastEnumeration>)signals {
456456
}] setNameWithFormat:@"+combineLatest: %@", signals];
457457
}
458458

459-
+ (RACSignal *)combineLatest:(id<NSFastEnumeration>)signals reduce:(id (^)())reduceBlock {
459+
+ (RACSignal *)combineLatest:(id<NSFastEnumeration>)signals reduce:(RACGenericReduceBlock)reduceBlock {
460460
NSCParameterAssert(reduceBlock != nil);
461461

462462
RACSignal *result = [self combineLatest:signals];

ReactiveObjC/RACSignal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ typedef RACSignal * _Nullable (^RACSignalBindBlock)(ValueType _Nullable value, B
268268
///
269269
/// Returns a new signal containing the results from each invocation of
270270
/// `reduceBlock`.
271-
+ (RACSignal<ValueType> *)zip:(id<NSFastEnumeration>)signals reduce:(RACReduceBlock)reduceBlock RAC_WARN_UNUSED_RESULT;
271+
+ (RACSignal<ValueType> *)zip:(id<NSFastEnumeration>)signals reduce:(RACGenericReduceBlock)reduceBlock RAC_WARN_UNUSED_RESULT;
272272

273273
/// Returns a signal obtained by concatenating `signals` in order.
274274
+ (RACSignal<ValueType> *)concat:(id<NSFastEnumeration>)signals RAC_WARN_UNUSED_RESULT;

ReactiveObjC/RACStream.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ NS_ASSUME_NONNULL_BEGIN
2323

2424
_Pragma("clang diagnostic push") \
2525
_Pragma("clang diagnostic ignored \"-Wstrict-prototypes\"") \
26-
typedef id _Nullable (^RACReduceBlock)();
27-
typedef ValueType _Nullable (^RACGenericReduceBlock)();
26+
typedef id _Nonnull (^RACReduceBlock)();
27+
typedef ValueType _Nonnull (^RACGenericReduceBlock)();
2828
_Pragma("clang diagnostic pop")
2929

3030
/// Returns an empty stream.
@@ -227,7 +227,7 @@ typedef RACStream * _Nullable (^RACStreamBindBlock)(ValueType _Nullable value, B
227227
///
228228
/// Returns a new stream containing the results from each invocation of
229229
/// `reduceBlock`.
230-
+ (__kindof RACStream<ValueType> *)zip:(id<NSFastEnumeration>)streams reduce:(RACReduceBlock)reduceBlock;
230+
+ (__kindof RACStream<ValueType> *)zip:(id<NSFastEnumeration>)streams reduce:(RACGenericReduceBlock)reduceBlock;
231231

232232
/// Returns a stream obtained by concatenating `streams` in order.
233233
+ (__kindof RACStream<ValueType> *)concat:(id<NSFastEnumeration>)streams;

ReactiveObjC/RACStream.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ - (__kindof RACStream *)ignore:(id)value {
139139
}] setNameWithFormat:@"[%@] -ignore: %@", self.name, RACDescription(value)];
140140
}
141141

142-
- (__kindof RACStream *)reduceEach:(id (^)())reduceBlock {
142+
- (__kindof RACStream *)reduceEach:(RACReduceBlock)reduceBlock {
143143
NSCParameterAssert(reduceBlock != nil);
144144

145145
__weak RACStream *stream __attribute__((unused)) = self;
@@ -234,7 +234,7 @@ + (__kindof RACStream *)zip:(id<NSFastEnumeration>)streams {
234234
}] setNameWithFormat:@"+zip: %@", streams];
235235
}
236236

237-
+ (__kindof RACStream *)zip:(id<NSFastEnumeration>)streams reduce:(id (^)())reduceBlock {
237+
+ (__kindof RACStream *)zip:(id<NSFastEnumeration>)streams reduce:(RACGenericReduceBlock)reduceBlock {
238238
NSCParameterAssert(reduceBlock != nil);
239239

240240
RACStream *result = [self zip:streams];

0 commit comments

Comments
 (0)