Renames flatMap index override to flatMapWithIndex.

Author: kzaher

RxExample/RxExample.xcodeproj/project.pbxproj

@@ -426,7 +426,7 @@
 		C8297EC81B6CF94B000589EA /* Observable+Aggregate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+Aggregate.swift"; sourceTree = "<group>"; };
 		C8297EC91B6CF94B000589EA /* Observable+Binding.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+Binding.swift"; sourceTree = "<group>"; };
 		C8297ECA1B6CF94B000589EA /* Observable+Concurrency.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+Concurrency.swift"; sourceTree = "<group>"; };
-		C8297ECB1B6CF94B000589EA /* Observable+Creation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "Observable+Creation.swift"; sourceTree = "<group>"; };
+		C8297ECB1B6CF94B000589EA /* Observable+Creation.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; lineEnding = 0; path = "Observable+Creation.swift"; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.swift; };
 		C8297ECC1B6CF94B000589EA /* Observable+Debug.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+Debug.swift"; sourceTree = "<group>"; };
 		C8297ECD1B6CF94B000589EA /* Observable+Multiple.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+Multiple.swift"; sourceTree = "<group>"; };
 		C8297ECE1B6CF94B000589EA /* Observable+Single.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Observable+Single.swift"; sourceTree = "<group>"; };

RxSwift/RxSwift/Observables/Observable+StandardSequenceOperators.swift

@@ -171,15 +171,15 @@ public func flatMapOrDie<E, R>
     }
 }
 
-public func flatMap<E, R>
+public func flatMapWithIndex<E, R>
     (selector: (E, Int) -> Observable<R>)
     -> Observable<E> -> Observable<R> {
     return { source in
         return FlatMap(source: source, selector: { success(selector($0, $1)) })
     }
 }
 
-public func flatMapOrDie<E, R>
+public func flatMapWithIndexOrDie<E, R>
     (selector: (E, Int) -> RxResult<Observable<R>>)
     -> Observable<E> -> Observable<R> {
     return { source in

RxTests/RxSwiftTests/Tests/Observable+StandardSequenceOperatorsTest.swift

@@ -1620,7 +1620,7 @@ extension ObservableStandardSequenceOperators {
             ])
 
         let res = scheduler.start {
-            xs >- flatMap { (x, i) in
+            xs >- flatMapWithIndex { (x, i) in
                 return just(ElementIndexPair(x, i))
             }
         }
@@ -1682,7 +1682,7 @@ extension ObservableStandardSequenceOperators {
             ])
 
         let res = scheduler.start {
-            xs >- flatMap { x, _ in x }
+            xs >- flatMapWithIndex { x, _ in x }
         }
 
         XCTAssertEqual(res.messages, [
@@ -1770,7 +1770,7 @@ extension ObservableStandardSequenceOperators {
             ])
 
         let res = scheduler.start {
-            xs >- flatMap { x, _ in x }
+            xs >- flatMapWithIndex { x, _ in x }
         }
 
         XCTAssertEqual(res.messages, [
@@ -1858,7 +1858,7 @@ extension ObservableStandardSequenceOperators {
             ])
 
         let res = scheduler.start {
-            xs >- flatMap { x, _ in x }
+            xs >- flatMapWithIndex { x, _ in x }
         }
 
         XCTAssertEqual(res.messages, [
@@ -1946,7 +1946,7 @@ extension ObservableStandardSequenceOperators {
             ])
 
         let res = scheduler.start {
-            xs >- flatMap { x, _ in x }
+            xs >- flatMapWithIndex { x, _ in x }
         }
 
         XCTAssertEqual(res.messages, [
@@ -2033,7 +2033,7 @@ extension ObservableStandardSequenceOperators {
             ])
 
         let res = scheduler.start {
-            xs >- flatMap { x, _ in x }
+            xs >- flatMapWithIndex { x, _ in x }
         }
 
         XCTAssertEqual(res.messages, [
@@ -2117,7 +2117,7 @@ extension ObservableStandardSequenceOperators {
             ])
 
         let res = scheduler.start(700) {
-            xs >- flatMap { x, _ in x }
+            xs >- flatMapWithIndex { x, _ in x }
         }
 
         XCTAssertEqual(res.messages, [
@@ -2199,7 +2199,7 @@ extension ObservableStandardSequenceOperators {
 
         var invoked = 0
         let res = scheduler.start {
-            return xs >- flatMapOrDie { (x: ColdObservable<Int>, _: Int) -> RxResult<Observable<Int>> in
+            return xs >- flatMapWithIndexOrDie { (x: ColdObservable<Int>, _: Int) -> RxResult<Observable<Int>> in
                 invoked++
                 if invoked == 3 {
                     return failure(testError)
@@ -2251,7 +2251,7 @@ extension ObservableStandardSequenceOperators {
 
         var invoked = 0
         let res = scheduler.start {
-            xs >- flatMap { (x, _) in
+            xs >- flatMapWithIndex { (x, _) in
                 return interval(10, scheduler) >- map { _ in x } >- take(x)
             }
         }