Skip to content
This repository has been archived by the owner on Sep 19, 2018. It is now read-only.

Commit

Permalink
Merge pull request #218 from bignerdranch/swift3
Browse files Browse the repository at this point in the history
Grabs changes from missed swift3 PR
  • Loading branch information
mdmathias authored Sep 16, 2016
2 parents 9ff7dbc + 5f420a8 commit c2780e5
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion Sources/JSONParsing.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ extension JSON {

/// Create `JSON` from UTF-8 `string`.
public init(jsonString: Swift.String, usingParser parser: JSONParserType.Type = JSONParser.self) throws {
self = try parser.createJSON(from: (jsonString as NSString).data(using: Swift.String.Encoding.utf8.rawValue) ?? Data())
self = try parser.createJSON(from: jsonString.data(using: Swift.String.Encoding.utf8) ?? Data())
}
}

Expand Down

0 comments on commit c2780e5

Please sign in to comment.