From de0d556bae8fa5467338cfb53c5de86c3471edd1 Mon Sep 17 00:00:00 2001 From: Ivan Smolin Date: Tue, 6 Mar 2018 15:22:44 +0300 Subject: [PATCH] simplify TotalCountCursor constraints --- Sources/Classes/Cursors/TotalCountCursor.swift | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/Sources/Classes/Cursors/TotalCountCursor.swift b/Sources/Classes/Cursors/TotalCountCursor.swift index b3a0d14d..e0e87891 100644 --- a/Sources/Classes/Cursors/TotalCountCursor.swift +++ b/Sources/Classes/Cursors/TotalCountCursor.swift @@ -23,15 +23,14 @@ import RxSwift import RxCocoa -public final class TotalCountCursor: ResettableCursorDataSource - where CC.ListingType == LT, CC.ElementType == ET { +public final class TotalCountCursor: ResettableCursorDataSource { - public typealias Element = ET - public typealias ResultType = [ET] + public typealias Element = CC.ElementType + public typealias ResultType = [CC.ElementType] private let configuration: CC - private var elements: [ET] = [] + private var elements: [Element] = [] public private(set) var totalCount: Int = .max @@ -45,7 +44,7 @@ public final class TotalCountCursor: return elements.count } - public subscript(index: Int) -> ET { + public subscript(index: Int) -> Element { return elements[index] } @@ -57,7 +56,7 @@ public final class TotalCountCursor: self.configuration = other.configuration.reset() } - public func loadNextBatch() -> Single<[ET]> { + public func loadNextBatch() -> Single<[Element]> { return configuration.nextBatchObservable() .map { [configuration] listing in configuration.getResult(from: listing)