Skip to content

Commit 2ee8410

Browse files
committed
Removed nullability attributes until Infer supports them
1 parent 61c1631 commit 2ee8410

File tree

3 files changed

+3
-18
lines changed

3 files changed

+3
-18
lines changed

Libraries/Image/RCTImageLoader.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
#import "RCTLog.h"
2323
#import "RCTUtils.h"
2424

25-
static void RCTDispatchCallbackOnMainQueue(void (^ __nonnull callback)(NSError *, id), NSError *error, UIImage *image)
25+
static void RCTDispatchCallbackOnMainQueue(void (^callback)(NSError *, id), NSError *error, UIImage *image)
2626
{
2727
if ([NSThread isMainThread]) {
2828
callback(error, image);

Libraries/Network/RCTDataManager.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ @implementation RCTHTTPFormDataHelper
4242
NSString *boundary;
4343
}
4444

45-
- (void)process:(NSArray *)formData callback:(nonnull void (^)(NSError *error, NSDictionary *result))callback
45+
- (void)process:(NSArray *)formData callback:(void (^)(NSError *error, NSDictionary *result))callback
4646
{
4747
if (![formData count]) {
4848
callback(nil, nil);
@@ -298,7 +298,7 @@ - (void)buildRequest:(NSDictionary *)query
298298
* - @"contentType" (NSString): the content type header of the request
299299
*
300300
*/
301-
- (void)processDataForHTTPQuery:(NSDictionary *)query callback:(nonnull void (^)(NSError *error, NSDictionary *result))callback
301+
- (void)processDataForHTTPQuery:(NSDictionary *)query callback:(void (^)(NSError *error, NSDictionary *result))callback
302302
{
303303
if (!query) {
304304
callback(nil, nil);

React/Base/RCTDefines.h

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,6 @@
1818
#define RCT_EXTERN extern __attribute__((visibility("default")))
1919
#endif
2020

21-
/**
22-
* Nullability for Xcode 6.2
23-
*/
24-
#if !__has_feature(nullability)
25-
#define NS_ASSUME_NONNULL_BEGIN
26-
#define NS_ASSUME_NONNULL_END
27-
#define nullable
28-
#define nonnull
29-
#define null_unspecified
30-
#define null_resettable
31-
#define __nullable
32-
#define __nonnull
33-
#define __null_unspecified
34-
#endif
35-
3621
/**
3722
* The RCT_DEBUG macro can be used to exclude error checking and logging code
3823
* from release builds to improve performance and reduce binary size.

0 commit comments

Comments
 (0)