Skip to content
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.

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

Remove nonnull requirement from BFTask.taskFromExecutor(_ ,block:). #218

Merged
merged 1 commit into from Jan 12, 2016
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Bolts/Common/BFTask.h
Expand Up @@ -107,7 +107,7 @@ typedef __nullable id(^BFContinuationBlock)(BFTask<ResultType> *task);
If block returns a BFTask, then the task returned from
this method will not be completed until that task is completed.
*/
+ (instancetype)taskFromExecutor:(BFExecutor *)executor withBlock:(id (^)())block;
+ (instancetype)taskFromExecutor:(BFExecutor *)executor withBlock:(nullable id (^)())block;

// Properties that will be set on the task once it is completed.

Expand Down
3 changes: 1 addition & 2 deletions Bolts/Common/BFTask.m
Expand Up @@ -199,8 +199,7 @@ + (instancetype)taskWithDelay:(int)millis
return tcs.task;
}

+ (instancetype)taskFromExecutor:(BFExecutor *)executor
withBlock:(id (^)())block {
+ (instancetype)taskFromExecutor:(BFExecutor *)executor withBlock:(nullable id (^)())block {
return [[self taskWithResult:nil] continueWithExecutor:executor withBlock:^id(BFTask *task) {
return block();
}];
Expand Down