Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Firestore/Swift/Source/Codable/CodableErrors.swift
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

public enum FirestoreDecodingError: Error {
case decodingIsNotSupported(String)
case fieldNameConfict(String)
case fieldNameConflict(String)
}

public enum FirestoreEncodingError: Error {
Expand Down
2 changes: 1 addition & 1 deletion Firestore/Swift/Tests/Codable/FirestoreEncoderTests.swift
Original file line number Diff line number Diff line change
Expand Up @@ -595,7 +595,7 @@ class FirestoreEncoderTests: XCTestCase {
in: FSTTestDocRef("abc/123")
)
XCTFail("Failed to throw")
} catch let FirestoreDecodingError.fieldNameConfict(msg) {
} catch let FirestoreDecodingError.fieldNameConflict(msg) {
XCTAssertEqual(msg, "Field name [\"docId\"] was found from document \"abc/123\", "
+ "cannot assign the document reference to this field.")
return
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ private struct _FirestoreKeyedDecodingContainer<K: CodingKey>: KeyedDecodingCont
var codingPathCopy = codingPath.map { key in key.stringValue }
codingPathCopy.append(key.stringValue)

throw FirestoreDecodingError.fieldNameConfict("Field name " +
throw FirestoreDecodingError.fieldNameConflict("Field name " +
"\(codingPathCopy) was found from document \"\(docPath)\", " +
"cannot assign the document reference to this field.")
}
Expand Down