Swift 4 migration #16
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
The files in |
|
Thanks! Working on it. |
|
I believe I've got the templates fixed. I re-generated and ran tests, and all seems clean. |
p2
requested changes
Nov 11, 2017
| tzhour = Int(hourStr.substring(to: hourStr.index(hourStr.startIndex, offsetBy: 2)))! | ||
| tzmin = Int(hourStr.substring(from: hourStr.index(hourStr.startIndex, offsetBy: 2)))! | ||
| else if 4 == hourStr.count { | ||
| tzhour = Int(hourStr[..<hourStr.index(hourStr.startIndex, offsetBy: 2)])! |
| @@ -276,7 +276,7 @@ class DateTimeTests: XCTestCase { | |||
| XCTAssertEqual(UInt8(33), d!.time!.minute) | |||
| XCTAssertEqual(29, d!.time!.second!) | |||
| XCTAssertFalse(nil == d!.timeZone) | |||
| XCTAssertEqual(TimeZone.current, d!.timeZone!, "Should default to local time zone but have \(d!.timeZone)") | |||
| XCTAssertEqual(TimeZone.current, d!.timeZone!, "Should default to local time zone but have \(String(describing: d!.timeZone))") | |||
| @@ -276,7 +276,7 @@ class DateTimeTests: XCTestCase { | |||
| XCTAssertEqual(UInt8(33), d!.time!.minute) | |||
| XCTAssertEqual(29, d!.time!.second!) | |||
| XCTAssertFalse(nil == d!.timeZone) | |||
| XCTAssertEqual(TimeZone.current, d!.timeZone!, "Should default to local time zone but have \(d!.timeZone!)") | |||
| XCTAssertEqual(TimeZone.current, d!.timeZone!, "Should default to local time zone but have \(String(describing: d!.timeZone!))") | |||
| @@ -191,7 +191,7 @@ public struct FHIRInstantiationContext { | |||
| public mutating func finalize(for json: FHIRJSON) { | |||
| for key in json.keys { // cannot use filter() because that uses a closure, which complains of caturing a mutating foobar | |||
| if !containsKey(key) { | |||
| addError(FHIRValidationError(unknown: key, ofType: type(of: json[key]!))) | |||
| addError(FHIRValidationError(unknown: key, ofType: Swift.type(of: json[key]!))) | |||
There was a problem hiding this comment.
I think the Swift namespace is not needed here, is it?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is the result of running Swift-FHIR through Xcode 9's Swift 4 migration. Additionally, I've silenced some deprecation warnings from Xcode 9.1 related to changes in String.