Skip to content

Commit d8f0551

Browse files
nlutsenkonlutsenko
authored
Make all 'trySet', 'set' functions to use explicit argument labels. (#30)
1 parent 4434f57 commit d8f0551

7 files changed

Lines changed: 38 additions & 38 deletions

File tree

‎Sources/BoltsSwift/Task+ContinueWith.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extension Task {
4848
taskCompletionSource.setState(nextTask.state)
4949
}
5050
case .Error(let error):
51-
taskCompletionSource.setError(error)
51+
taskCompletionSource.set(error: error)
5252
case .Cancelled:
5353
taskCompletionSource.cancel()
5454
default: abort() // This should never happen.
@@ -57,10 +57,10 @@ extension Task {
5757

5858
case .Success(let result as S):
5959
// This is for continueOnErrorWith - the type of the result doesn't change, so we can pass it through
60-
taskCompletionSource.setResult(result)
60+
taskCompletionSource.set(result: result)
6161

6262
case .Error(let error):
63-
taskCompletionSource.setError(error)
63+
taskCompletionSource.set(error: error)
6464

6565
case .Cancelled:
6666
taskCompletionSource.cancel()

‎Sources/BoltsSwift/Task+Delay.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ extension Task {
2525
let taskCompletionSource = TaskCompletionSource<Void>()
2626
let time = dispatch_time(DISPATCH_TIME_NOW, Int64(delay * NSTimeInterval(NSEC_PER_SEC)))
2727
dispatch_after(time, dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0)) {
28-
taskCompletionSource.trySetResult()
28+
taskCompletionSource.trySet(result: ())
2929
}
3030
return taskCompletionSource.task
3131
}

‎Sources/BoltsSwift/Task+WhenAll.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ extension Task {
4444
if cancelledCount > 0 {
4545
tcs.cancel()
4646
} else if errorCount > 0 {
47-
tcs.setError(AggregateError(errors: tasks.flatMap({ $0.error })))
47+
tcs.set(error: AggregateError(errors: tasks.flatMap({ $0.error })))
4848
} else {
49-
tcs.setResult()
49+
tcs.set(result: ())
5050
}
5151
}
5252
}

‎Sources/BoltsSwift/Task+WhenAny.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ extension Task {
3636
break
3737
}
3838
task.continueWith { task in
39-
taskCompletionSource.trySetResult()
39+
taskCompletionSource.trySet(result: ())
4040
}
4141
}
4242
return taskCompletionSource.task

‎Sources/BoltsSwift/Task.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public final class Task<TResult> {
110110
public convenience init(_ executor: Executor = .Default, closure: (Void throws -> TResult)) {
111111
self.init(state: .Pending())
112112
executor.execute {
113-
self.trySetState(TaskState.fromClosure(closure))
113+
self.trySet(state: TaskState.fromClosure(closure))
114114
}
115115
}
116116

@@ -234,7 +234,7 @@ public final class Task<TResult> {
234234

235235
// MARK: State Change
236236

237-
func trySetState(state: TaskState<TResult>) -> Bool {
237+
func trySet(state state: TaskState<TResult>) -> Bool {
238238
var stateChanged = false
239239

240240
var continuations: [Continuation]?

‎Sources/BoltsSwift/TaskCompletionSource.swift‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public class TaskCompletionSource<TResult> {
4646

4747
- parameter result: The task result.
4848
*/
49-
public func setResult(result: TResult) {
50-
guard task.trySetState(.Success(result)) else {
49+
public func set(result result: TResult) {
50+
guard task.trySet(state: .Success(result)) else {
5151
preconditionFailure("Can not set the result on a completed task.")
5252
}
5353
}
@@ -59,8 +59,8 @@ public class TaskCompletionSource<TResult> {
5959

6060
- parameter error: The task error.
6161
*/
62-
public func setError(error: ErrorType) {
63-
guard task.trySetState(.Error(error)) else {
62+
public func set(error error: ErrorType) {
63+
guard task.trySet(state: .Error(error)) else {
6464
preconditionFailure("Can not set error on a completed task.")
6565
}
6666
}
@@ -71,7 +71,7 @@ public class TaskCompletionSource<TResult> {
7171
Throws an exception if the task is already completed.
7272
*/
7373
public func cancel() {
74-
guard task.trySetState(.Cancelled) else {
74+
guard task.trySet(state: .Cancelled) else {
7575
preconditionFailure("Can not cancel a completed task.")
7676
}
7777
}
@@ -82,8 +82,8 @@ public class TaskCompletionSource<TResult> {
8282
- parameter result: The task result.
8383
- returns: `true` if the result was set, `false` otherwise.
8484
*/
85-
public func trySetResult(result: TResult) -> Bool {
86-
return task.trySetState(.Success(result))
85+
public func trySet(result result: TResult) -> Bool {
86+
return task.trySet(state: .Success(result))
8787
}
8888

8989
/**
@@ -92,8 +92,8 @@ public class TaskCompletionSource<TResult> {
9292
- parameter error: The task error.
9393
- returns: `true` if the error was set, `false` otherwise.
9494
*/
95-
public func trySetError(error: ErrorType) -> Bool {
96-
return task.trySetState(.Error(error))
95+
public func trySet(error error: ErrorType) -> Bool {
96+
return task.trySet(state: .Error(error))
9797
}
9898

9999
/**
@@ -102,15 +102,15 @@ public class TaskCompletionSource<TResult> {
102102
- returns: `true` if the task was completed, `false` otherwise.
103103
*/
104104
public func tryCancel() -> Bool {
105-
return task.trySetState(.Cancelled)
105+
return task.trySet(state: .Cancelled)
106106
}
107107

108108
//--------------------------------------
109109
// MARK: - Change Task State (internal)
110110
//--------------------------------------
111111

112112
func setState(state: TaskState<TResult>) {
113-
guard task.trySetState(state) else {
113+
guard task.trySet(state: state) else {
114114
preconditionFailure("Can not complete a completed task.")
115115
}
116116
}

‎Tests/TaskCompletionSourceTests.swift‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import BoltsSwift
1313
class TaskCompletionSourceTests: XCTestCase {
1414

1515
func testInit() {
16-
let sut = TaskCompletionSource<String>()
17-
let task = sut.task
16+
let tcs = TaskCompletionSource<String>()
17+
let task = tcs.task
1818

1919
XCTAssertFalse(task.completed)
2020
XCTAssertFalse(task.faulted)
@@ -24,10 +24,10 @@ class TaskCompletionSourceTests: XCTestCase {
2424
}
2525

2626
func testSetResult() {
27-
let sut = TaskCompletionSource<String>()
28-
let task = sut.task
27+
let tcs = TaskCompletionSource<String>()
28+
let task = tcs.task
2929

30-
sut.setResult(currentTestName)
30+
tcs.set(result: currentTestName)
3131

3232
XCTAssertTrue(task.completed)
3333
XCTAssertNotNil(task.result)
@@ -36,10 +36,10 @@ class TaskCompletionSourceTests: XCTestCase {
3636

3737
func testSetError() {
3838
let error = NSError(domain: "com.bolts", code: 1, userInfo: nil)
39-
let sut = TaskCompletionSource<String>()
40-
let task = sut.task
39+
let tcs = TaskCompletionSource<String>()
40+
let task = tcs.task
4141

42-
sut.setError(error)
42+
tcs.set(error: error)
4343

4444
XCTAssertTrue(task.completed)
4545
XCTAssertTrue(task.faulted)
@@ -48,10 +48,10 @@ class TaskCompletionSourceTests: XCTestCase {
4848
}
4949

5050
func testCancel() {
51-
let sut = TaskCompletionSource<String>()
52-
let task = sut.task
51+
let tcs = TaskCompletionSource<String>()
52+
let task = tcs.task
5353

54-
sut.cancel()
54+
tcs.cancel()
5555

5656
XCTAssertTrue(task.completed)
5757
XCTAssertTrue(task.cancelled)
@@ -61,7 +61,7 @@ class TaskCompletionSourceTests: XCTestCase {
6161
let sut = TaskCompletionSource<String>()
6262
let task = sut.task
6363

64-
let success = sut.trySetResult(currentTestName)
64+
let success = sut.trySet(result: currentTestName)
6565

6666
XCTAssertTrue(success)
6767
XCTAssertTrue(task.completed)
@@ -74,7 +74,7 @@ class TaskCompletionSourceTests: XCTestCase {
7474
let sut = TaskCompletionSource<String>()
7575
let task = sut.task
7676

77-
let success = sut.trySetError(error)
77+
let success = sut.trySet(error: error)
7878

7979
XCTAssertTrue(success)
8080
XCTAssertTrue(task.completed)
@@ -96,26 +96,26 @@ class TaskCompletionSourceTests: XCTestCase {
9696

9797
func testTrySetResultReturningFalse() {
9898
let sut = TaskCompletionSource<String>()
99-
sut.setResult(currentTestName)
99+
sut.set(result: currentTestName)
100100

101-
let success = sut.trySetResult(currentTestName)
101+
let success = sut.trySet(result: currentTestName)
102102

103103
XCTAssertFalse(success)
104104
}
105105

106106
func testTrySetErrorReturningFalse() {
107107
let error = NSError(domain: "com.bolts", code: 1, userInfo: nil)
108108
let sut = TaskCompletionSource<String>()
109-
sut.setResult(currentTestName)
109+
sut.set(result: currentTestName)
110110

111-
let success = sut.trySetError(error)
111+
let success = sut.trySet(error: error)
112112

113113
XCTAssertFalse(success)
114114
}
115115

116116
func testTryCancelReturningFalse() {
117117
let sut = TaskCompletionSource<String>()
118-
sut.setResult(currentTestName)
118+
sut.set(result: currentTestName)
119119
let success = sut.tryCancel()
120120
XCTAssertFalse(success)
121121
}

0 commit comments

Comments
 (0)