Skip to content

Commit 715bcb8

Browse files
M0rtyMerrfreak4pc
authored andcommitted
Remove flatMapSync operator (#216)
1 parent 6b69976 commit 715bcb8

File tree

3 files changed

+5
-84
lines changed

3 files changed

+5
-84
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Changelog
66
- Simplify `filterMap(_:)` implementation and make callback throwing
77
- `once` now uses a `NSRecursiveLock` instead of the deprecated `OSAtomicOr32OrigBarrier`
88
- added `merge(with:)` for `Observable`
9+
- removed `flatMapSync` operator
910

1011
5.0.0
1112
-----

RxSwiftExt.xcodeproj/project.pbxproj

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -142,20 +142,17 @@
142142
780CB21F20A0EE8300FD3F39 /* MapManyTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 780CB21C20A0EE8300FD3F39 /* MapManyTests.swift */; };
143143
78199613228449CA00340AF4 /* UIScrollView+reachedBottom.swift in Sources */ = {isa = PBXBuildFile; fileRef = 78199612228449CA00340AF4 /* UIScrollView+reachedBottom.swift */; };
144144
7819961622844EF800340AF4 /* UIScrollView+reachedBottomTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7819961422844E9D00340AF4 /* UIScrollView+reachedBottomTests.swift */; };
145-
782485B7229952FD005CF8CC /* TestErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485B6229952FD005CF8CC /* TestErrors.swift */; };
146-
782485B8229952FD005CF8CC /* TestErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485B6229952FD005CF8CC /* TestErrors.swift */; };
147-
782485B9229952FD005CF8CC /* TestErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485B6229952FD005CF8CC /* TestErrors.swift */; };
148145
782485932298A708005CF8CC /* mergeWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485922298A702005CF8CC /* mergeWith.swift */; };
149146
782485952298A785005CF8CC /* MergeWithTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485942298A785005CF8CC /* MergeWithTests.swift */; };
150147
782485962298A785005CF8CC /* MergeWithTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485942298A785005CF8CC /* MergeWithTests.swift */; };
151148
782485972298A785005CF8CC /* MergeWithTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485942298A785005CF8CC /* MergeWithTests.swift */; };
152149
7824859B2298ADE2005CF8CC /* mergeWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485922298A702005CF8CC /* mergeWith.swift */; };
153150
7824859C2298ADE2005CF8CC /* mergeWith.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485922298A702005CF8CC /* mergeWith.swift */; };
151+
782485B7229952FD005CF8CC /* TestErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485B6229952FD005CF8CC /* TestErrors.swift */; };
152+
782485B8229952FD005CF8CC /* TestErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485B6229952FD005CF8CC /* TestErrors.swift */; };
153+
782485B9229952FD005CF8CC /* TestErrors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 782485B6229952FD005CF8CC /* TestErrors.swift */; };
154154
789682E720408A7500545396 /* mapAt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF5F8B2202D6C5F00C1BA97 /* mapAt.swift */; };
155155
789682E820408A7700545396 /* mapAt.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF5F8B2202D6C5F00C1BA97 /* mapAt.swift */; };
156-
789A2A9C22A53F1E00548EF9 /* flatMapSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789A2A9B22A53F1E00548EF9 /* flatMapSync.swift */; };
157-
789A2A9D22A53F1E00548EF9 /* flatMapSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789A2A9B22A53F1E00548EF9 /* flatMapSync.swift */; };
158-
789A2A9E22A53F1E00548EF9 /* flatMapSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 789A2A9B22A53F1E00548EF9 /* flatMapSync.swift */; };
159156
8CF5F8AF202D62AB00C1BA97 /* MapAtTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF5F8AD202D622000C1BA97 /* MapAtTests.swift */; };
160157
8CF5F8B0202D62AD00C1BA97 /* MapAtTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF5F8AD202D622000C1BA97 /* MapAtTests.swift */; };
161158
8CF5F8B1202D62AE00C1BA97 /* MapAtTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8CF5F8AD202D622000C1BA97 /* MapAtTests.swift */; };
@@ -362,10 +359,9 @@
362359
780CB21C20A0EE8300FD3F39 /* MapManyTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MapManyTests.swift; sourceTree = "<group>"; };
363360
78199612228449CA00340AF4 /* UIScrollView+reachedBottom.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIScrollView+reachedBottom.swift"; sourceTree = "<group>"; };
364361
7819961422844E9D00340AF4 /* UIScrollView+reachedBottomTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIScrollView+reachedBottomTests.swift"; sourceTree = "<group>"; };
365-
782485B6229952FD005CF8CC /* TestErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestErrors.swift; path = Tests/TestErrors.swift; sourceTree = "<group>"; };
366-
789A2A9B22A53F1E00548EF9 /* flatMapSync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = flatMapSync.swift; sourceTree = "<group>"; };
367362
782485922298A702005CF8CC /* mergeWith.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = mergeWith.swift; sourceTree = "<group>"; };
368363
782485942298A785005CF8CC /* MergeWithTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = MergeWithTests.swift; sourceTree = "<group>"; };
364+
782485B6229952FD005CF8CC /* TestErrors.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = TestErrors.swift; path = Tests/TestErrors.swift; sourceTree = "<group>"; };
369365
8CF5F8AD202D622000C1BA97 /* MapAtTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapAtTests.swift; sourceTree = "<group>"; };
370366
8CF5F8B2202D6C5F00C1BA97 /* mapAt.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = mapAt.swift; sourceTree = "<group>"; };
371367
98309EB01EDF159500BD07D9 /* filterMap.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = filterMap.swift; path = Source/RxSwift/filterMap.swift; sourceTree = SOURCE_ROOT; };
@@ -542,7 +538,6 @@
542538
B69B45482190C27D00F30418 /* count.swift */,
543539
5386079D1E6F334B000361DE /* distinct.swift */,
544540
98309EB01EDF159500BD07D9 /* filterMap.swift */,
545-
789A2A9B22A53F1E00548EF9 /* flatMapSync.swift */,
546541
BF515CE11F3F371600492640 /* fromAsync.swift */,
547542
5386079E1E6F334B000361DE /* ignore.swift */,
548543
5386079F1E6F334B000361DE /* ignoreErrors.swift */,
@@ -1047,7 +1042,6 @@
10471042
3DBDE5FC1FBBAE3A00DF47F9 /* and.swift in Sources */,
10481043
8CF5F8B3202D6C5F00C1BA97 /* mapAt.swift in Sources */,
10491044
538607B31E6F334B000361DE /* not.swift in Sources */,
1050-
789A2A9C22A53F1E00548EF9 /* flatMapSync.swift in Sources */,
10511045
B69B45492190C27D00F30418 /* count.swift in Sources */,
10521046
538607AD1E6F334B000361DE /* distinct.swift in Sources */,
10531047
D7C72A421FDC5D8F00EAAAAB /* nwise.swift in Sources */,
@@ -1138,7 +1132,6 @@
11381132
62512C771F0EAF950083A89F /* pausableBuffered.swift in Sources */,
11391133
62512C761F0EAF950083A89F /* pausable.swift in Sources */,
11401134
62512C721F0EAF950083A89F /* materialized+elements.swift in Sources */,
1141-
789A2A9D22A53F1E00548EF9 /* flatMapSync.swift in Sources */,
11421135
C4D2154520118FC1009804AE /* ofType.swift in Sources */,
11431136
62512C6E1F0EAF950083A89F /* ignore.swift in Sources */,
11441137
3D11958B1FCAD9AE0095134B /* and.swift in Sources */,
@@ -1226,7 +1219,6 @@
12261219
E39C41E81F18B08A007F2ACD /* pausableBuffered.swift in Sources */,
12271220
E39C41E71F18B08A007F2ACD /* pausable.swift in Sources */,
12281221
E39C41E31F18B08A007F2ACD /* materialized+elements.swift in Sources */,
1229-
789A2A9E22A53F1E00548EF9 /* flatMapSync.swift in Sources */,
12301222
C4D2154620118FC1009804AE /* ofType.swift in Sources */,
12311223
E39C41DF1F18B08A007F2ACD /* ignore.swift in Sources */,
12321224
3D11958C1FCAD9AF0095134B /* and.swift in Sources */,

Source/RxSwift/flatMapSync.swift

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

0 commit comments

Comments
 (0)