diff options
| author | Thomas Van Lenten <thomasvl@google.com> | 2016-07-06 10:15:55 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 10:15:55 -0400 |
| commit | ec4589736e71a332d63c129c1cf8e532098c2633 (patch) | |
| tree | 1146a800dcd69e4a15dee8504fcb6f5b97b7207f | |
| parent | cae3b0cbb689d0ed1e5da73942a5a9705f3411b0 (diff) | |
| parent | 523bfd4f233cbf6b898d22806a980f284c8402ce (diff) | |
| download | protobuf-ec4589736e71a332d63c129c1cf8e532098c2633.tar.gz protobuf-ec4589736e71a332d63c129c1cf8e532098c2633.tar.bz2 protobuf-ec4589736e71a332d63c129c1cf8e532098c2633.zip | |
Merge pull request #1712 from dkharrat/swift-error-handling
add nullable qualifier to return types that can be nil, to support Swift 2 try-catch syntax
| -rw-r--r-- | objectivec/GPBMessage.h | 40 | ||||
| -rw-r--r-- | objectivec/Tests/GPBSwiftTests.swift | 2 |
2 files changed, 21 insertions, 21 deletions
diff --git a/objectivec/GPBMessage.h b/objectivec/GPBMessage.h index b3b07793..9608cdb0 100644 --- a/objectivec/GPBMessage.h +++ b/objectivec/GPBMessage.h @@ -97,7 +97,7 @@ CF_EXTERN_C_END /// the data can not be parsed. /// /// @return A new instance of the class messaged. -+ (instancetype)parseFromData:(NSData *)data error:(NSError **)errorPtr; ++ (nullable instancetype)parseFromData:(NSData *)data error:(NSError **)errorPtr; /// Creates a new instance by parsing the data. This method should be sent to /// the generated message class that the data should be interpreted as. If @@ -116,9 +116,9 @@ CF_EXTERN_C_END /// reason if the data can not be parsed. /// /// @return A new instance of the class messaged. -+ (instancetype)parseFromData:(NSData *)data - extensionRegistry:(nullable GPBExtensionRegistry *)extensionRegistry - error:(NSError **)errorPtr; ++ (nullable instancetype)parseFromData:(NSData *)data + extensionRegistry:(nullable GPBExtensionRegistry *)extensionRegistry + error:(NSError **)errorPtr; /// Creates a new instance by parsing the data from the given input stream. This /// method should be sent to the generated message class that the data should @@ -137,10 +137,10 @@ CF_EXTERN_C_END /// reason if the data can not be parsed. /// /// @return A new instance of the class messaged. -+ (instancetype)parseFromCodedInputStream:(GPBCodedInputStream *)input - extensionRegistry: - (nullable GPBExtensionRegistry *)extensionRegistry - error:(NSError **)errorPtr; ++ (nullable instancetype)parseFromCodedInputStream:(GPBCodedInputStream *)input + extensionRegistry: + (nullable GPBExtensionRegistry *)extensionRegistry + error:(NSError **)errorPtr; /// Creates a new instance by parsing the data from the given input stream. This /// method should be sent to the generated message class that the data should @@ -160,10 +160,10 @@ CF_EXTERN_C_END /// reason if the data can not be parsed. /// /// @return A new instance of the class messaged. -+ (instancetype)parseDelimitedFromCodedInputStream:(GPBCodedInputStream *)input - extensionRegistry: - (nullable GPBExtensionRegistry *)extensionRegistry - error:(NSError **)errorPtr; ++ (nullable instancetype)parseDelimitedFromCodedInputStream:(GPBCodedInputStream *)input + extensionRegistry: + (nullable GPBExtensionRegistry *)extensionRegistry + error:(NSError **)errorPtr; /// Initializes an instance by parsing the data. This method should be sent to /// the generated message class that the data should be interpreted as. If @@ -179,7 +179,7 @@ CF_EXTERN_C_END /// @param data The data to parse. /// @param errorPtr An optional error pointer to fill in with a failure reason if /// the data can not be parsed. -- (instancetype)initWithData:(NSData *)data error:(NSError **)errorPtr; +- (nullable instancetype)initWithData:(NSData *)data error:(NSError **)errorPtr; /// Initializes an instance by parsing the data. This method should be sent to /// the generated message class that the data should be interpreted as. If @@ -196,9 +196,9 @@ CF_EXTERN_C_END /// @param extensionRegistry The extension registry to use to look up extensions. /// @param errorPtr An optional error pointer to fill in with a failure /// reason if the data can not be parsed. -- (instancetype)initWithData:(NSData *)data - extensionRegistry:(nullable GPBExtensionRegistry *)extensionRegistry - error:(NSError **)errorPtr; +- (nullable instancetype)initWithData:(NSData *)data + extensionRegistry:(nullable GPBExtensionRegistry *)extensionRegistry + error:(NSError **)errorPtr; /// Initializes an instance by parsing the data from the given input stream. This /// method should be sent to the generated message class that the data should @@ -216,10 +216,10 @@ CF_EXTERN_C_END /// @param extensionRegistry The extension registry to use to look up extensions. /// @param errorPtr An optional error pointer to fill in with a failure /// reason if the data can not be parsed. -- (instancetype)initWithCodedInputStream:(GPBCodedInputStream *)input - extensionRegistry: - (nullable GPBExtensionRegistry *)extensionRegistry - error:(NSError **)errorPtr; +- (nullable instancetype)initWithCodedInputStream:(GPBCodedInputStream *)input + extensionRegistry: + (nullable GPBExtensionRegistry *)extensionRegistry + error:(NSError **)errorPtr; /// Writes out the message to the given output stream. - (void)writeToCodedOutputStream:(GPBCodedOutputStream *)output; diff --git a/objectivec/Tests/GPBSwiftTests.swift b/objectivec/Tests/GPBSwiftTests.swift index 474fde38..b5999c21 100644 --- a/objectivec/Tests/GPBSwiftTests.swift +++ b/objectivec/Tests/GPBSwiftTests.swift @@ -446,7 +446,7 @@ class GPBBridgeTests: XCTestCase { let data = msg.data() - let msg2 = Message2(data: data!, error:nil) + let msg2 = try! Message2(data: data!) XCTAssertTrue(msg2 !== msg) // New instance XCTAssertEqual(msg.optionalInt32, Int32(100)) XCTAssertEqual(msg.optionalInt64, Int64(101)) |