From 05df012fb51f70ab520827dc392cc2727ddfaa0f Mon Sep 17 00:00:00 2001 From: Igor Palaguta Date: Mon, 13 Apr 2020 13:07:48 +0300 Subject: [PATCH] Use Error suffix for Error structs --- .../CoreData/Parser/Attribute+XMLParser.swift | 4 ++-- .../MotoSwiftFramework/CoreData/Parser/ModelParser.swift | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Sources/MotoSwiftFramework/CoreData/Parser/Attribute+XMLParser.swift b/Sources/MotoSwiftFramework/CoreData/Parser/Attribute+XMLParser.swift index d44595b..43fcd85 100644 --- a/Sources/MotoSwiftFramework/CoreData/Parser/Attribute+XMLParser.swift +++ b/Sources/MotoSwiftFramework/CoreData/Parser/Attribute+XMLParser.swift @@ -28,13 +28,13 @@ private extension AttributeType { init(stringValue: String) throws { guard let type = AttributeType.typesMapping[stringValue] else { - throw UnknownAttributeType(type: stringValue) + throw UnknownAttributeTypeError(type: stringValue) } self = type } } -private struct UnknownAttributeType: Error, CustomStringConvertible { +private struct UnknownAttributeTypeError: Error, CustomStringConvertible { let type: String var description: String { diff --git a/Sources/MotoSwiftFramework/CoreData/Parser/ModelParser.swift b/Sources/MotoSwiftFramework/CoreData/Parser/ModelParser.swift index 0c55268..863148d 100644 --- a/Sources/MotoSwiftFramework/CoreData/Parser/ModelParser.swift +++ b/Sources/MotoSwiftFramework/CoreData/Parser/ModelParser.swift @@ -27,16 +27,16 @@ public final class ModelParser { let versionKey = "_XCCurrentVersionName" guard let plist = NSDictionary(contentsOfFile: String(describing: versionFilePath)), let versionFile = plist[versionKey] as? String else { - throw AbsentPlistKey(key: versionKey, path: versionFilePath) + throw AbsentPlistKeyError(key: versionKey, path: versionFilePath) } return path + versionFile default: - throw InvalidModelType(path: path) + throw InvalidModelTypeError(path: path) } } } -private struct AbsentPlistKey: Error, CustomStringConvertible { +private struct AbsentPlistKeyError: Error, CustomStringConvertible { let key: String let path: Path @@ -45,7 +45,7 @@ private struct AbsentPlistKey: Error, CustomStringConvertible { } } -private struct InvalidModelType: Error, CustomStringConvertible { +private struct InvalidModelTypeError: Error, CustomStringConvertible { let path: Path var description: String {