Skip to content

Commit 30c20bc

Browse files
inamiyinamiy
committed
Delete funny custom operators.
1 parent fc7f707 commit 30c20bc

File tree

5 files changed

+5
-244
lines changed

5 files changed

+5
-244
lines changed

‎README.md‎

Lines changed: 0 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -100,50 +100,6 @@ task.progress { progress in
100100
}
101101
```
102102

103-
### Using custom operator
104-
105-
You can even use custom operators for chaining! :dizzy:
106-
107-
- `task ~ {...}` = `task.progress { progress in ...}`
108-
- `task >>> {...}` = `task.then { value, errorInfo in ...}` (fulfilled & rejected)
109-
- `task *** {...}` = `task.then { value in ...}` (fulfilled only)
110-
- `task !!! {...}` = `task.catch { errorInfo in ...}` (rejected only)
111-
112-
```swift
113-
task ~ { (progress: Float) in
114-
115-
println("progress = \(progress)")
116-
117-
} *** { (value: String) -> String in
118-
119-
XCTAssertEqual(value, "OK")
120-
return "Now OK"
121-
122-
} !!! { (error: ErrorString?, isCancelled: Bool) -> String in
123-
124-
XCTAssertEqual(error!, "ERROR")
125-
return "Now RECOVERED"
126-
127-
} >>> { (value: String?, errorInfo: Task.ErrorInfo?) -> Task in
128-
129-
println("value = \(value)") // either "Now OK" or "Now RECOVERED"
130-
131-
XCTAssertTrue(value!.hasPrefix("Now"))
132-
XCTAssertTrue(errorInfo == nil)
133-
134-
return Task(error: "ABORT")
135-
136-
} >>> { (value: String?, errorInfo: Task.ErrorInfo?) -> Void in
137-
138-
println("errorInfo = \(errorInfo)")
139-
140-
XCTAssertTrue(value == nil)
141-
XCTAssertEqual(errorInfo!.error!, "ABORT")
142-
expect.fulfill()
143-
144-
}
145-
```
146-
147103
For more examples, please see XCTest cases.
148104

149105

‎SwiftTask.xcodeproj/project.pbxproj‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
1F0E284019C1DEA0005EF467 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0E282319C1DEA0005EF467 /* Async.swift */; };
11-
1F2024FF19AD97A700DE0495 /* CustomOperatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F2024FE19AD97A700DE0495 /* CustomOperatorTests.swift */; };
1211
1F20250219ADA8FD00DE0495 /* BasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F20250119ADA8FD00DE0495 /* BasicTests.swift */; };
1312
1F24C72B19D0688800C2FDC7 /* SwiftTask.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 48CD5A0C19AEE3570042B9F1 /* SwiftTask.framework */; };
1413
1F46DEDA199EDF1000F97868 /* SwiftTask.h in Headers */ = {isa = PBXBuildFile; fileRef = 1F46DED9199EDF1000F97868 /* SwiftTask.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -19,7 +18,6 @@
1918
4822F0DC19D00B2300F5F572 /* _TestCase.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEFC199EE2C200F97868 /* _TestCase.swift */; };
2019
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F20250119ADA8FD00DE0495 /* BasicTests.swift */; };
2120
4822F0DE19D00B2300F5F572 /* SwiftTaskTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */; };
22-
4822F0DF19D00B2300F5F572 /* CustomOperatorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F2024FE19AD97A700DE0495 /* CustomOperatorTests.swift */; };
2321
4822F0E019D00B2300F5F572 /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
2422
4822F0E319D00B3100F5F572 /* Async.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1F0E282319C1DEA0005EF467 /* Async.swift */; };
2523
48511C5B19C17563002FE03C /* RetainCycleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 48511C5A19C17563002FE03C /* RetainCycleTests.swift */; };
@@ -62,7 +60,6 @@
6260

6361
/* Begin PBXFileReference section */
6462
1F0E282319C1DEA0005EF467 /* Async.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Async.swift; sourceTree = "<group>"; };
65-
1F2024FE19AD97A700DE0495 /* CustomOperatorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CustomOperatorTests.swift; sourceTree = "<group>"; };
6663
1F20250119ADA8FD00DE0495 /* BasicTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BasicTests.swift; sourceTree = "<group>"; };
6764
1F46DED4199EDF1000F97868 /* SwiftTask.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = SwiftTask.framework; sourceTree = BUILT_PRODUCTS_DIR; };
6865
1F46DED8199EDF1000F97868 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -169,7 +166,6 @@
169166
1F46DEFC199EE2C200F97868 /* _TestCase.swift */,
170167
1F20250119ADA8FD00DE0495 /* BasicTests.swift */,
171168
1F46DEE3199EDF1000F97868 /* SwiftTaskTests.swift */,
172-
1F2024FE19AD97A700DE0495 /* CustomOperatorTests.swift */,
173169
48511C5A19C17563002FE03C /* RetainCycleTests.swift */,
174170
1F5FA35619A374E600975FB9 /* AlamofireTests.swift */,
175171
1F46DEE1199EDF1000F97868 /* Supporting Files */,
@@ -447,7 +443,6 @@
447443
isa = PBXSourcesBuildPhase;
448444
buildActionMask = 2147483647;
449445
files = (
450-
1F2024FF19AD97A700DE0495 /* CustomOperatorTests.swift in Sources */,
451446
1F20250219ADA8FD00DE0495 /* BasicTests.swift in Sources */,
452447
1F0E284019C1DEA0005EF467 /* Async.swift in Sources */,
453448
1F6A8CA319A4E4F200369A5D /* SwiftTaskTests.swift in Sources */,
@@ -462,7 +457,6 @@
462457
files = (
463458
4822F0DE19D00B2300F5F572 /* SwiftTaskTests.swift in Sources */,
464459
4822F0DD19D00B2300F5F572 /* BasicTests.swift in Sources */,
465-
4822F0DF19D00B2300F5F572 /* CustomOperatorTests.swift in Sources */,
466460
4822F0E319D00B3100F5F572 /* Async.swift in Sources */,
467461
4822F0DC19D00B2300F5F572 /* _TestCase.swift in Sources */,
468462
4822F0E019D00B2300F5F572 /* RetainCycleTests.swift in Sources */,

‎SwiftTask/SwiftTask.swift‎

Lines changed: 0 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -635,57 +635,6 @@ extension Task
635635
}
636636
}
637637

638-
//--------------------------------------------------
639-
// MARK: - Custom Operators
640-
//--------------------------------------------------
641-
642-
// then (fulfilled & rejected)
643-
infix operator >>> { associativity left }
644-
645-
public func >>> <P, V1, V2, E>(left: Task<P, V1, E>, right: (V1?, (E?, Bool)?) -> V2) -> Task<P, V2, E>
646-
{
647-
return left.then(right)
648-
}
649-
650-
public func >>> <P1, V1, P2, V2, E>(left: Task<P1, V1, E>, right: (V1?, (E?, Bool)?) -> Task<P2, V2, E>) -> Task<P2, V2, E>
651-
{
652-
return left.then(right)
653-
}
654-
655-
// then (fulfilled only)
656-
infix operator *** { associativity left }
657-
658-
public func *** <P, V1, V2, E>(left: Task<P, V1, E>, right: V1 -> V2) -> Task<P, V2, E>
659-
{
660-
return left.then(right)
661-
}
662-
663-
public func *** <P1, V1, P2, V2, E>(left: Task<P1, V1, E>, right: V1 -> Task<P2, V2, E>) -> Task<P2, V2, E>
664-
{
665-
return left.then(right)
666-
}
667-
668-
// catch (rejected only)
669-
infix operator !!! { associativity left }
670-
671-
public func !!! <P, V, E>(left: Task<P, V, E>, right: (E?, Bool) -> V) -> Task<P, V, E>
672-
{
673-
return left.catch(right)
674-
}
675-
676-
public func !!! <P, V, E>(left: Task<P, V, E>, right: (E?, Bool) -> Task<P, V, E>) -> Task<P, V, E>
677-
{
678-
return left.catch(right)
679-
}
680-
681-
// progress
682-
infix operator ~ { associativity left }
683-
684-
public func ~ <P, V, E>(left: Task<P, V, E>, right: P -> Void) -> Task<P, V, E>
685-
{
686-
return left.progress(right)
687-
}
688-
689638
//--------------------------------------------------
690639
// MARK: - Utility
691640
//--------------------------------------------------

‎SwiftTaskTests/BasicTests.swift‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,21 +36,21 @@ class BasicTests: _TestCase
3636

3737
}
3838

39-
task ~ { (progress: Float) in
39+
task.progress { (progress: Float) in
4040

4141
println("progress = \(progress)")
4242

43-
} *** { (value: String) -> String in // then(onFulfilled)
43+
}.then { (value: String) -> String in // then(onFulfilled)
4444

4545
XCTAssertEqual(value, "OK")
4646
return "Now OK"
4747

48-
} !!! { (error: ErrorString?, isCancelled: Bool) -> String in // catch(onRejected)
48+
}.catch { (error: ErrorString?, isCancelled: Bool) -> String in // catch(onRejected)
4949

5050
XCTAssertEqual(error!, "ERROR")
5151
return "Now RECOVERED"
5252

53-
} >>> { (value: String?, errorInfo: Task.ErrorInfo?) -> Task in // then(onFulfilled+onRejected)
53+
}.then { (value: String?, errorInfo: Task.ErrorInfo?) -> Task in // then(onFulfilled+onRejected)
5454

5555
println("value = \(value)") // either "Now OK" or "Now RECOVERED"
5656

@@ -59,7 +59,7 @@ class BasicTests: _TestCase
5959

6060
return Task(error: "ABORT")
6161

62-
} >>> { (value: String?, errorInfo: Task.ErrorInfo?) -> Void in // then(onFulfilled+onRejected)
62+
}.then { (value: String?, errorInfo: Task.ErrorInfo?) -> Void in // then(onFulfilled+onRejected)
6363

6464
println("errorInfo = \(errorInfo)")
6565

‎SwiftTaskTests/CustomOperatorTests.swift‎

Lines changed: 0 additions & 138 deletions
This file was deleted.

0 commit comments

Comments
 (0)