Skip to content

Fix typo in SingleValueContainer in JSONDecoder.swift #3057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2021
Merged

Fix typo in SingleValueContainer in JSONDecoder.swift #3057

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions Sources/Foundation/JSONDecoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ extension JSONDecoderImpl: Decoder {
}

@usableFromInline func singleValueContainer() throws -> SingleValueDecodingContainer {
SingleValueContainter(
SingleValueContainer(
impl: self,
codingPath: self.codingPath,
json: self.json
Expand Down Expand Up @@ -293,18 +293,18 @@ extension JSONDecoderImpl: Decoder {
return try Date(from: self)

case .secondsSince1970:
let container = SingleValueContainter(impl: self, codingPath: self.codingPath, json: self.json)
let container = SingleValueContainer(impl: self, codingPath: self.codingPath, json: self.json)
let double = try container.decode(Double.self)
return Date(timeIntervalSince1970: double)

case .millisecondsSince1970:
let container = SingleValueContainter(impl: self, codingPath: self.codingPath, json: self.json)
let container = SingleValueContainer(impl: self, codingPath: self.codingPath, json: self.json)
let double = try container.decode(Double.self)
return Date(timeIntervalSince1970: double / 1000.0)

case .iso8601:
if #available(macOS 10.12, iOS 10.0, watchOS 3.0, tvOS 10.0, *) {
let container = SingleValueContainter(impl: self, codingPath: self.codingPath, json: self.json)
let container = SingleValueContainer(impl: self, codingPath: self.codingPath, json: self.json)
let string = try container.decode(String.self)
guard let date = _iso8601Formatter.date(from: string) else {
throw DecodingError.dataCorrupted(DecodingError.Context(codingPath: self.codingPath, debugDescription: "Expected date string to be ISO8601-formatted."))
Expand All @@ -316,7 +316,7 @@ extension JSONDecoderImpl: Decoder {
}

case .formatted(let formatter):
let container = SingleValueContainter(impl: self, codingPath: self.codingPath, json: self.json)
let container = SingleValueContainer(impl: self, codingPath: self.codingPath, json: self.json)
let string = try container.decode(String.self)
guard let date = formatter.date(from: string) else {
throw DecodingError.dataCorrupted(DecodingError.Context(codingPath: self.codingPath, debugDescription: "Date string does not match format expected by formatter."))
Expand All @@ -334,7 +334,7 @@ extension JSONDecoderImpl: Decoder {
return try Data(from: self)

case .base64:
let container = SingleValueContainter(impl: self, codingPath: self.codingPath, json: self.json)
let container = SingleValueContainer(impl: self, codingPath: self.codingPath, json: self.json)
let string = try container.decode(String.self)

guard let data = Data(base64Encoded: string) else {
Expand All @@ -349,7 +349,7 @@ extension JSONDecoderImpl: Decoder {
}

private func unwrapURL() throws -> URL {
let container = SingleValueContainter(impl: self, codingPath: self.codingPath, json: self.json)
let container = SingleValueContainer(impl: self, codingPath: self.codingPath, json: self.json)
let string = try container.decode(String.self)

guard let url = URL(string: string) else {
Expand Down Expand Up @@ -520,7 +520,7 @@ extension Decodable {
}

extension JSONDecoderImpl {
struct SingleValueContainter: SingleValueDecodingContainer {
struct SingleValueContainer: SingleValueDecodingContainer {
let impl: JSONDecoderImpl
let value: JSONValue
let codingPath: [CodingKey]
Expand Down