Skip to content

Commit d8e12b9

Browse files
committed
Minor cleanup for TaskError and Equatable
1 parent 647a371 commit d8e12b9

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ReactiveTask/Errors.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import Foundation
1010
import ReactiveCocoa
1111

1212
/// An error originating from ReactiveTask.
13-
public enum TaskError: ErrorType {
13+
public enum TaskError: ErrorType, Equatable {
1414
/// A shell task exited unsuccessfully.
1515
case ShellTaskFailed(Task, exitCode: Int32, standardError: String?)
1616

@@ -35,14 +35,14 @@ extension TaskError: CustomStringConvertible {
3535
}
3636
}
3737

38-
extension TaskError: Equatable {}
39-
40-
public func ==(lhs: TaskError, rhs: TaskError) -> Bool {
38+
public func == (lhs: TaskError, rhs: TaskError) -> Bool {
4139
switch (lhs, rhs) {
42-
case (.ShellTaskFailed(let lhsTask, let lhsCode, let lhsErr), .ShellTaskFailed(let rhsTask, let rhsCode, let rhsErr)):
40+
case let (.ShellTaskFailed(lhsTask, lhsCode, lhsErr), .ShellTaskFailed(rhsTask, rhsCode, rhsErr)):
4341
return lhsTask == rhsTask && lhsCode == rhsCode && lhsErr == rhsErr
44-
case (.POSIXError(let lhsCode), .POSIXError(let rhsCode)):
42+
43+
case let (.POSIXError(lhsCode), .POSIXError(rhsCode)):
4544
return lhsCode == rhsCode
45+
4646
default:
4747
return false
4848
}

ReactiveTaskTests/TaskSpec.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ class TaskSpec: QuickSpec {
8787
.wait()
8888

8989
expect(result).notTo(beNil())
90-
expect(result.error).toNot(beNil())
90+
expect(result.error).notTo(beNil())
9191
expect(result.error) == TaskError.ShellTaskFailed(task, exitCode: 1, standardError: "stat: not-a-real-file: stat: No such file or directory\n")
9292
if let error = result.error {
9393
expect(error.description) == "A shell task (/usr/bin/stat not-a-real-file) failed with exit code 1:\nstat: not-a-real-file: stat: No such file or directory\n"

0 commit comments

Comments
 (0)