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 /objectivec/Tests/GPBSwiftTests.swift | |
| 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
Diffstat (limited to 'objectivec/Tests/GPBSwiftTests.swift')
| -rw-r--r-- | objectivec/Tests/GPBSwiftTests.swift | 2 |
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)) |