Merge pull request #108 from Carthage/equatable-tweaks

Equatable tweaks

Author: mdiep

Sources/Errors.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 /// An error originating from ReactiveTask.
-public enum TaskError: Error {
+public enum TaskError: Error, Equatable {
 	/// A shell task exited unsuccessfully.
 	case shellTaskFailed(Task, exitCode: Int32, standardError: String?)
 
@@ -33,18 +33,3 @@ extension TaskError: CustomStringConvertible {
 		}
 	}
 }
-
-extension TaskError: Equatable {
-	public static func == (lhs: TaskError, rhs: TaskError) -> Bool {
-		switch (lhs, rhs) {
-		case let (.shellTaskFailed(lhsTask, lhsCode, lhsErr), .shellTaskFailed(rhsTask, rhsCode, rhsErr)):
-			return lhsTask == rhsTask && lhsCode == rhsCode && lhsErr == rhsErr
-
-		case let (.posixError(lhsCode), .posixError(rhsCode)):
-			return lhsCode == rhsCode
-
-		default:
-			return false
-		}
-	}
-}

Sources/Task.swift

@@ -88,19 +88,6 @@ extension Task: Hashable {
 	}
 }
 
-private func ==<Key, Value: Equatable>(lhs: [Key: Value]?, rhs: [Key: Value]?) -> Bool {
-	switch (lhs, rhs) {
-	case let (lhs?, rhs?):
-		return lhs == rhs
-		
-	case (.none, .none):
-		return true
-		
-	default:
-		return false
-	}
-}
-
 /// A private class used to encapsulate a Unix pipe.
 private final class Pipe {
 	typealias ReadProducer = SignalProducer<Data, TaskError>
@@ -331,7 +318,7 @@ public enum TaskEvent<T>: TaskEventType {
 	}
 }
 
-extension TaskEvent where T: Equatable {
+extension TaskEvent: Equatable where T: Equatable {
 	public static func == (lhs: TaskEvent<T>, rhs: TaskEvent<T>) -> Bool {
 		switch (lhs, rhs) {
 		case let (.launch(left), .launch(right)):