aboutsummaryrefslogtreecommitdiffhomepage
path: root/objectivec/Tests
diff options
context:
space:
mode:
authorGravatar Dia Kharrat <dkharrat@gmail.com>2016-06-24 00:05:02 -0700
committerGravatar Dia Kharrat <dkharrat@gmail.com>2016-07-05 01:30:41 -0700
commit523bfd4f233cbf6b898d22806a980f284c8402ce (patch)
tree1146a800dcd69e4a15dee8504fcb6f5b97b7207f /objectivec/Tests
parentcae3b0cbb689d0ed1e5da73942a5a9705f3411b0 (diff)
add nullable qualifier to nil return types
Add the `nullable` qualifier to return types of Objective-C methods that can return a nil due to errors. This change makes these methods compatible with the Swift 2 try-catch syntax.
Diffstat (limited to 'objectivec/Tests')
-rw-r--r--objectivec/Tests/GPBSwiftTests.swift2
1 files changed, 1 insertions, 1 deletions
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))