Skip to content

Commit

Permalink
fixed and cleaned up fatal error for wrong types
Browse files Browse the repository at this point in the history
  • Loading branch information
Rivukis committed Dec 11, 2017
1 parent 4e825ad commit 0a2d0b9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Example/Source/Constant.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ private func fatalError(title: String, entries: [String]) -> Never {

internal enum Constant {
enum FatalError {
static func wrongTypesBeingCompared(_ actual: SpryEquatable?, _ me: SpryEquatable) -> Never {
static func wrongTypesBeingCompared(self me: SpryEquatable, actual: SpryEquatable) -> Never {
let title = "Wrong types being equated"
let entries = [
"<\(type(of: actual))> could NOT be cast as <\(type(of: me))>"
"<\(actual)> could NOT be cast as <\(type(of: me))>"
]

fatalError(title: title, entries: entries)
Expand Down
12 changes: 6 additions & 6 deletions Example/Source/SpryEquatable.swift
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public extension SpryEquatable {
public extension SpryEquatable where Self: Equatable {
func _isEqual(to actual: SpryEquatable?) -> Bool {
guard let castedActual = actual as? Self else {
Constant.FatalError.wrongTypesBeingCompared(actual, self)
Constant.FatalError.wrongTypesBeingCompared(self: self, actual: actual)
}

return self == castedActual
Expand All @@ -41,7 +41,7 @@ public extension SpryEquatable where Self: Equatable {
public extension SpryEquatable where Self: AnyObject {
func _isEqual(to actual: SpryEquatable?) -> Bool {
guard let castedActual = actual as? Self else {
Constant.FatalError.wrongTypesBeingCompared(actual, self)
Constant.FatalError.wrongTypesBeingCompared(self: self, actual: actual)
}

return self === castedActual
Expand All @@ -53,7 +53,7 @@ public extension SpryEquatable where Self: AnyObject {
public extension SpryEquatable where Self: AnyObject & Equatable {
func _isEqual(to actual: SpryEquatable?) -> Bool {
guard let castedActual = actual as? Self else {
Constant.FatalError.wrongTypesBeingCompared(actual, self)
Constant.FatalError.wrongTypesBeingCompared(self: self, actual: actual)
}

return self === castedActual
Expand All @@ -65,7 +65,7 @@ public extension SpryEquatable where Self: AnyObject & Equatable {
public extension Array {
func _isEqual(to actual: SpryEquatable?) -> Bool {
guard let castedActual = actual as? Array<Element> else {
Constant.FatalError.wrongTypesBeingCompared(actual, self)
Constant.FatalError.wrongTypesBeingCompared(self: self, actual: actual)
}

if self.count != castedActual.count {
Expand All @@ -91,7 +91,7 @@ public extension Array {
public extension Dictionary {
func _isEqual(to actual: SpryEquatable?) -> Bool {
guard let castedActual = actual as? Dictionary<Key, Value> else {
Constant.FatalError.wrongTypesBeingCompared(actual, self)
Constant.FatalError.wrongTypesBeingCompared(self: self, actual: actual)
}

if self.count != castedActual.count {
Expand Down Expand Up @@ -135,7 +135,7 @@ public extension SpryEquatable where Self: OptionalType {
}

guard type(of: self) == type(of: actual) else {
Constant.FatalError.wrongTypesBeingCompared(actual, self)
Constant.FatalError.wrongTypesBeingCompared(self: self, actual: actual)
}

let selfsWrappedValue = selfMirror.children.first?.value
Expand Down

0 comments on commit 0a2d0b9

Please sign in to comment.