From 30d054cffcfa54d9dc9e8d76392f3315158522e8 Mon Sep 17 00:00:00 2001 From: freak4pc Date: Sat, 3 Oct 2020 18:47:54 +0300 Subject: [PATCH] Rename `elementAt(_:)` to `element(at:)` --- RxSwift/Observables/ElementAt.swift | 15 ++++++++++++++- .../Observable+ElementAtTests.swift | 18 +++++++++--------- 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/RxSwift/Observables/ElementAt.swift b/RxSwift/Observables/ElementAt.swift index 8b6305df..3f09c708 100644 --- a/RxSwift/Observables/ElementAt.swift +++ b/RxSwift/Observables/ElementAt.swift @@ -7,6 +7,19 @@ // extension ObservableType { + /** + Returns a sequence emitting only element _n_ emitted by an Observable + + - seealso: [elementAt operator on reactivex.io](http://reactivex.io/documentation/operators/elementat.html) + + - parameter index: The index of the required element (starting from 0). + - returns: An observable sequence that emits the desired element as its own sole emission. + */ + @available(*, deprecated, renamed: "element(at:)") + public func elementAt(_ index: Int) + -> Observable { + element(at: index) + } /** Returns a sequence emitting only element _n_ emitted by an Observable @@ -16,7 +29,7 @@ extension ObservableType { - parameter index: The index of the required element (starting from 0). - returns: An observable sequence that emits the desired element as its own sole emission. */ - public func elementAt(_ index: Int) + public func element(at index: Int) -> Observable { ElementAt(source: self.asObservable(), index: index, throwOnEmpty: true) } diff --git a/Tests/RxSwiftTests/Observable+ElementAtTests.swift b/Tests/RxSwiftTests/Observable+ElementAtTests.swift index bab11dd4..4a848f11 100644 --- a/Tests/RxSwiftTests/Observable+ElementAtTests.swift +++ b/Tests/RxSwiftTests/Observable+ElementAtTests.swift @@ -42,7 +42,7 @@ extension ObservableElementAtTest { ]) let res = scheduler.start { - xs.elementAt(10) + xs.element(at: 10) } XCTAssertEqual(res.events, [ @@ -71,7 +71,7 @@ extension ObservableElementAtTest { ]) let res = scheduler.start { - xs.elementAt(10) + xs.element(at: 10) } XCTAssertEqual(res.events, [ @@ -110,7 +110,7 @@ extension ObservableElementAtTest { ]) let res = scheduler.start { - xs.elementAt(10) + xs.element(at: 10) } XCTAssertEqual(res.events, [ @@ -138,7 +138,7 @@ extension ObservableElementAtTest { ]) let res = scheduler.start { - xs.elementAt(10) + xs.element(at: 10) } XCTAssertEqual(res.events, [ @@ -177,7 +177,7 @@ extension ObservableElementAtTest { ]) let res = scheduler.start(disposed: 250) { - xs.elementAt(3) + xs.element(at: 3) } XCTAssertEqual(res.events, []) @@ -214,7 +214,7 @@ extension ObservableElementAtTest { ]) let res = scheduler.start(disposed: 400) { - xs.elementAt(3) + xs.element(at: 3) } XCTAssertEqual(res.events, [ @@ -245,7 +245,7 @@ extension ObservableElementAtTest { ]) let res = scheduler.start { - xs.elementAt(0) + xs.element(at: 0) } XCTAssertEqual(res.events, [ @@ -260,11 +260,11 @@ extension ObservableElementAtTest { #if TRACE_RESOURCES func testElementAtReleasesResourcesOnComplete() { - _ = Observable.just(1).elementAt(0).subscribe() + _ = Observable.just(1).element(at: 0).subscribe() } func testElementAtReleasesResourcesOnError() { - _ = Observable.error(testError).elementAt(1).subscribe() + _ = Observable.error(testError).element(at: 1).subscribe() } #endif }