Merge pull request #84 from Carthage/operator-as-static-func

Implement `==` operator as a static function

Author: mdiep

ReactiveTask/Errors.swift

@@ -9,7 +9,7 @@
 import Foundation
 
 /// An error originating from ReactiveTask.
-public enum TaskError: Error, Equatable {
+public enum TaskError: Error {
 	/// A shell task exited unsuccessfully.
 	case shellTaskFailed(Task, exitCode: Int32, standardError: String?)
 
@@ -34,15 +34,17 @@ extension TaskError: CustomStringConvertible {
 	}
 }
 
-public 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
+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
+		case let (.posixError(lhsCode), .posixError(rhsCode)):
+			return lhsCode == rhsCode
 
-	default:
-		return false
+		default:
+			return false
+		}
 	}
 }

ReactiveTask/Task.swift

@@ -63,6 +63,13 @@ extension Task: CustomStringConvertible {
 }
 
 extension Task: Hashable {
+	public static func == (lhs: Task, rhs: Task) -> Bool {
+		return lhs.launchPath == rhs.launchPath
+			&& lhs.arguments == rhs.arguments
+			&& lhs.workingDirectoryPath == rhs.workingDirectoryPath
+			&& lhs.environment == rhs.environment
+	}
+
 	public var hashValue: Int {
 		var result = launchPath.hashValue ^ (workingDirectoryPath?.hashValue ?? 0)
 		for argument in arguments {
@@ -88,10 +95,6 @@ private func ==<Key: Equatable, Value: Equatable>(lhs: [Key: Value]?, rhs: [Key:
 	}
 }
 
-public func ==(lhs: Task, rhs: Task) -> Bool {
-	return lhs.launchPath == rhs.launchPath && lhs.arguments == rhs.arguments && lhs.workingDirectoryPath == rhs.workingDirectoryPath && lhs.environment == rhs.environment
-}
-
 /// A private class used to encapsulate a Unix pipe.
 private final class Pipe {
 	typealias ReadProducer = SignalProducer<Data, TaskError>
@@ -324,22 +327,24 @@ public enum TaskEvent<T>: TaskEventType {
 	}
 }
 
-public func == <T: Equatable>(lhs: TaskEvent<T>, rhs: TaskEvent<T>) -> Bool {
-	switch (lhs, rhs) {
-	case let (.launch(left), .launch(right)):
-		return left == right
-	
-	case let (.standardOutput(left), .standardOutput(right)):
-		return left == right
-	
-	case let (.standardError(left), .standardError(right)):
-		return left == right
-	
-	case let (.success(left), .success(right)):
-		return left == right
-	
-	default:
-		return false
+extension TaskEvent where T: Equatable {
+	public static func == (lhs: TaskEvent<T>, rhs: TaskEvent<T>) -> Bool {
+		switch (lhs, rhs) {
+		case let (.launch(left), .launch(right)):
+			return left == right
+
+		case let (.standardOutput(left), .standardOutput(right)):
+			return left == right
+
+		case let (.standardError(left), .standardError(right)):
+			return left == right
+
+		case let (.success(left), .success(right)):
+			return left == right
+
+		default:
+			return false
+		}
 	}
 }