make all swift 4 xc9b3 for check

carlosypunto · kzaher · commit dee213605294 · 2017-07-15T20:39:45.000+02:00
diff --git a/RxCocoa/Traits/SharedSequence/ObservableConvertibleType+SharedSequence.swift b/RxCocoa/Traits/SharedSequence/ObservableConvertibleType+SharedSequence.swift
@@ -17,7 +17,7 @@ extension ObservableConvertibleType {
     - parameter onErrorJustReturn: Element to return in case of error and after that complete the sequence.
     - returns: Driving observable sequence.
     */
-    public func asSharedSequence<S: SharingStrategyProtocol>(sharingStrategy: S.Type = S.self, onErrorJustReturn: E) -> SharedSequence<S, E> {
+    public func asSharedSequence<S>(sharingStrategy: S.Type = S.self, onErrorJustReturn: E) -> SharedSequence<S, E> {
         let source = self
             .asObservable()
             .observeOn(S.scheduler)
@@ -31,7 +31,7 @@ extension ObservableConvertibleType {
     - parameter onErrorDriveWith: SharedSequence that provides elements of the sequence in case of error.
     - returns: Driving observable sequence.
     */
-    public func asSharedSequence<S: SharingStrategyProtocol>(sharingStrategy: S.Type = S.self, onErrorDriveWith: SharedSequence<S, E>) -> SharedSequence<S, E> {
+    public func asSharedSequence<S>(sharingStrategy: S.Type = S.self, onErrorDriveWith: SharedSequence<S, E>) -> SharedSequence<S, E> {
         let source = self
             .asObservable()
             .observeOn(S.scheduler)
@@ -47,7 +47,7 @@ extension ObservableConvertibleType {
     - parameter onErrorRecover: Calculates driver that continues to drive the sequence in case of error.
     - returns: Driving observable sequence.
     */
-    public func asSharedSequence<S: SharingStrategyProtocol>(sharingStrategy: S.Type = S.self, onErrorRecover: @escaping (_ error: Swift.Error) -> SharedSequence<S, E>) -> SharedSequence<S, E> {
+    public func asSharedSequence<S>(sharingStrategy: S.Type = S.self, onErrorRecover: @escaping (_ error: Swift.Error) -> SharedSequence<S, E>) -> SharedSequence<S, E> {
         let source = self
             .asObservable()
             .observeOn(S.scheduler)
diff --git a/RxCocoa/Traits/SharedSequence/SharedSequence+Operators.swift b/RxCocoa/Traits/SharedSequence/SharedSequence+Operators.swift
@@ -434,7 +434,7 @@ extension SharedSequenceConvertibleType {
     - parameter resultSelector: Function to invoke for each element from the self combined with the latest element from the second source, if any.
     - returns: An observable sequence containing the result of combining each element of the self  with the latest element from the second source, if any, using the specified result selector function.
     */
-    public func withLatestFrom<SecondO: SharedSequenceConvertibleType, ResultType>(_ second: SecondO, resultSelector: @escaping (E, SecondO.E) -> ResultType) -> SharedSequence<SharingStrategy, ResultType> where SecondO.SharingStrategy == SecondO.SharingStrategy {
+    public func withLatestFrom<SecondO: SharedSequenceConvertibleType, ResultType>(_ second: SecondO, resultSelector: @escaping (E, SecondO.E) -> ResultType) -> SharedSequence<SharingStrategy, ResultType> where SecondO.SharingStrategy == SharingStrategy {
         let source = self.asObservable()
             .withLatestFrom(second.asSharedSequence(), resultSelector: resultSelector)
 
diff --git a/RxExample/RxDataSources/DataSources/UI+SectionedViewType.swift b/RxExample/RxDataSources/DataSources/UI+SectionedViewType.swift
@@ -51,7 +51,7 @@ extension UITableView : SectionedViewType {
         self.reloadSections(indexSet(sections), with: animationStyle)
     }
 
-  public func performBatchUpdates<S: SectionModelType>(_ changes: Changeset<S>, animationConfiguration: AnimationConfiguration) {
+  public func performBatchUpdates<S>(_ changes: Changeset<S>, animationConfiguration: AnimationConfiguration) {
         self.beginUpdates()
         _performBatchUpdates(self, changes: changes, animationConfiguration: animationConfiguration)
         self.endUpdates()
diff --git a/RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesAPI.swift b/RxExample/RxExample/Examples/GitHubSearchRepositories/GitHubSearchRepositoriesAPI.swift
@@ -105,7 +105,7 @@ extension GitHubSearchRepositoriesAPI {
 
         for m in matches {
             let matches = (1 ..< m.numberOfRanges).map { rangeIndex -> String in
-                let range = m.rangeAt(rangeIndex)
+                let range = m.range(at: rangeIndex)
                 let startIndex = links.characters.index(links.startIndex, offsetBy: range.location)
                 let endIndex = links.characters.index(links.startIndex, offsetBy: range.location + range.length)
                 let stringRange = startIndex ..< endIndex
diff --git a/RxExample/RxExample/Services/HtmlParsing.swift b/RxExample/RxExample/Services/HtmlParsing.swift
@@ -21,7 +21,7 @@ func parseImageURLsfromHTML(_ html: NSString) throws -> [URL]  {
             return nil
         }
         
-        let url = html.substring(with: match.rangeAt(1))
+        let url = html.substring(with: match.range(at: 1))
         
         var absoluteURLString = url
         if url.hasPrefix("//") {
diff --git a/RxExample/RxExample/Services/Wireframe.swift b/RxExample/RxExample/Services/Wireframe.swift
@@ -37,7 +37,7 @@ class DefaultWireframe: Wireframe {
             #if swift(>=4.0)
                 NSWorkspace.shared.open(url)
             #else
-                NSWorkspace.shared().open(url)
+                NSWorkspace.shared.open(url)
             #endif
         #endif
     }
diff --git a/RxSwift/ObservableType.swift b/RxSwift/ObservableType.swift
@@ -8,8 +8,6 @@
 
 /// Represents a push style sequence.
 public protocol ObservableType : ObservableConvertibleType {
-    /// Type of elements in sequence.
-    associatedtype E
     
     /**
     Subscribes `observer` to receive events for this sequence.
diff --git a/RxSwift/Observables/CombineLatest+Collection.swift b/RxSwift/Observables/CombineLatest+Collection.swift
@@ -146,7 +146,7 @@ final fileprivate class CombineLatestCollectionType<C: Collection, R> : Producer
     init(sources: C, resultSelector: @escaping ResultSelector) {
         _sources = sources
         _resultSelector = resultSelector
-        _count = Int(self._sources.count.toIntMax())
+        _count = Int(Int64(self._sources.count))
     }
     
     override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
diff --git a/RxSwift/Observables/Concat.swift b/RxSwift/Observables/Concat.swift
@@ -55,7 +55,7 @@ extension Observable {
      */
     public static func concat<S: Collection >(_ collection: S) -> Observable<Element>
         where S.Iterator.Element == Observable<Element> {
-            return Concat(sources: collection, count: collection.count.toIntMax())
+            return Concat(sources: collection, count: Int64(collection.count))
     }
 
     /**
@@ -72,7 +72,7 @@ extension Observable {
      - returns: An observable sequence that contains the elements of each given sequence, in sequential order.
      */
     public static func concat(_ sources: Observable<Element> ...) -> Observable<Element> {
-        return Concat(sources: sources, count: sources.count.toIntMax())
+        return Concat(sources: sources, count: Int64(sources.count))
     }
 }
 
diff --git a/RxSwift/Observables/ObserveOn.swift b/RxSwift/Observables/ObserveOn.swift
@@ -102,7 +102,7 @@ final fileprivate class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {
         }
     }
     
-    func run(_ state: Void, recurse: (Void) -> Void) {
+    func run(_ state: (), _ recurse: (()) -> ()) {
         let (nextEvent, observer) = self._lock.calculateLocked { () -> (Event<E>?, O) in
             if self._queue.count > 0 {
                 return (self._queue.dequeue(), self._observer)
diff --git a/RxSwift/Observables/Zip+Collection.swift b/RxSwift/Observables/Zip+Collection.swift
@@ -158,7 +158,7 @@ final fileprivate class ZipCollectionType<C: Collection, R> : Producer<R> where
     init(sources: C, resultSelector: @escaping ResultSelector) {
         self.sources = sources
         self.resultSelector = resultSelector
-        self.count = Int(self.sources.count.toIntMax())
+        self.count = Int(Int64(self.sources.count))
     }
     
     override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
diff --git a/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift b/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
@@ -43,7 +43,7 @@ extension DispatchQueueConfiguration {
         let compositeDisposable = CompositeDisposable()
 
         let timer = DispatchSource.makeTimerSource(queue: queue)
-        timer.scheduleOneshot(deadline: deadline)
+        timer.schedule(deadline: deadline, leeway: leeway)
 
         // TODO:
         // This looks horrible, and yes, it is.
@@ -77,7 +77,7 @@ extension DispatchQueueConfiguration {
         var timerState = state
 
         let timer = DispatchSource.makeTimerSource(queue: queue)
-        timer.scheduleRepeating(deadline: initial, interval: dispatchInterval(period), leeway: leeway)
+        timer.schedule(deadline: initial, repeating: dispatchInterval(period), leeway: leeway)
 
         // TODO:
         // This looks horrible, and yes, it is.
diff --git a/Tests/RxCocoaTests/DelegateProxyTest.swift b/Tests/RxCocoaTests/DelegateProxyTest.swift
@@ -459,7 +459,7 @@ final class Food: NSObject {
 }
 
 final class ThreeDSectionedView: NSObject {
-    dynamic var delegate: ThreeDSectionedViewProtocol?
+    @objc dynamic var delegate: ThreeDSectionedViewProtocol?
 }
 
 // }
diff --git a/Tests/RxCocoaTests/Driver+Test.swift b/Tests/RxCocoaTests/Driver+Test.swift
@@ -252,8 +252,8 @@ extension DriverTest {
 extension DriverTest {
     func testVariableAsDriver() {
         var hotObservable: Variable<Int>? = Variable(1)
-        let driver = Driver.zip(hotObservable!.asDriver(), Driver.of(0, 0)) { all in
-            return all.0
+        let driver = Driver.zip(hotObservable!.asDriver(), Driver.of(0, 0)) { (optInt, int) in
+            return optInt
         }
 
         let results = subscribeTwiceOnBackgroundSchedulerAndOnlyOneSubscription(driver) {
@@ -581,7 +581,7 @@ extension DriverTest {
         let hotObservable = BackgroundThreadPrimitiveHotObservable<Int>()
 
         var completed = false
-        let driver = hotObservable.asDriver(onErrorJustReturn: -1).do(onCompleted: { e in
+        let driver = hotObservable.asDriver(onErrorJustReturn: -1).do(onCompleted: {
             XCTAssertTrue(DispatchQueue.isMain)
             completed = true
         })
diff --git a/Tests/RxCocoaTests/KVOObservableTests.swift b/Tests/RxCocoaTests/KVOObservableTests.swift
@@ -20,13 +20,13 @@ final class KVOObservableTests : RxTest {
 }
 
 final class TestClass : NSObject {
-    dynamic var pr: String? = "0"
+    @objc dynamic var pr: String? = "0"
 }
 
 final class Parent : NSObject {
     var disposeBag: DisposeBag! = DisposeBag()
 
-    dynamic var val: String = ""
+    @objc dynamic var val: String = ""
 
     init(callback: @escaping (String?) -> Void) {
         super.init()
@@ -57,7 +57,7 @@ final class Child : NSObject {
 }
 
 final class ParentWithChild : NSObject {
-    dynamic var val: String = ""
+    @objc dynamic var val: String = ""
     
     var child: Child? = nil
     
@@ -99,19 +99,19 @@ final class ParentWithChild : NSObject {
 }
 
 final class HasStrongProperty : NSObject {
-    dynamic var property: NSObject? = nil
-    dynamic var frame: CGRect
-    dynamic var point: CGPoint
-    dynamic var size: CGSize
-    dynamic var intEnum: IntEnum = .one
-    dynamic var uintEnum: UIntEnum = .one
-    dynamic var int32Enum: Int32Enum = .one
-    dynamic var uint32Enum: UInt32Enum = .one
-    dynamic var int64Enum: Int64Enum = .one
-    dynamic var uint64Enum: UInt64Enum = .one
-
-    dynamic var integer: Int
-    dynamic var uinteger: UInt
+    @objc dynamic var property: NSObject? = nil
+    @objc dynamic var frame: CGRect
+    @objc dynamic var point: CGPoint
+    @objc dynamic var size: CGSize
+    @objc dynamic var intEnum: IntEnum = .one
+    @objc dynamic var uintEnum: UIntEnum = .one
+    @objc dynamic var int32Enum: Int32Enum = .one
+    @objc dynamic var uint32Enum: UInt32Enum = .one
+    @objc dynamic var int64Enum: Int64Enum = .one
+    @objc dynamic var uint64Enum: UInt64Enum = .one
+    
+    @objc dynamic var integer: Int
+    @objc dynamic var uinteger: UInt
     
     override init() {
         self.frame = CGRect(x: 0, y: 0, width: 100, height: 100)
@@ -125,7 +125,7 @@ final class HasStrongProperty : NSObject {
 }
 
 final class HasWeakProperty : NSObject {
-    dynamic weak var property: NSObject? = nil
+    @objc dynamic weak var property: NSObject? = nil
     
     override init() {
         super.init()
diff --git a/Tests/RxCocoaTests/RuntimeStateSnapshot.swift b/Tests/RxCocoaTests/RuntimeStateSnapshot.swift
@@ -14,7 +14,7 @@ final class ObjectRuntimeState {
 
     init(target: AnyObject) {
         assert(object_getClass(target) == type(of: target))
-        real = ClassRuntimeState(object_getClass(target))
+        real = ClassRuntimeState(object_getClass(target)!)
         actingAs = ClassRuntimeState(RXObjCTestRuntime.objCClass(target))
     }
 
@@ -148,7 +148,7 @@ struct ClassRuntimeState {
 
         var result = [Selector: IMP]()
         for i in 0 ..< count {
-            let method: Method = methods!.advanced(by: Int(i)).pointee!
+            let method: Method = methods!.advanced(by: Int(i)).pointee
             result[method_getName(method)] = method_getImplementation(method)
         }
 
diff --git a/Tests/RxSwiftTests/BagTest.swift b/Tests/RxSwiftTests/BagTest.swift
@@ -138,7 +138,7 @@ extension BagTest {
                     }
                     increment2 += 1
                 })
-                _ = bag3.value.insert(Disposables.create { _ in
+                _ = bag3.value.insert(Disposables.create {
                     if increment3 == breakAt {
                         bag3.value.removeAll()
                     }
diff --git a/Tests/RxSwiftTests/Observable+DistinctUntilChangedTests.swift b/Tests/RxSwiftTests/Observable+DistinctUntilChangedTests.swift
@@ -174,7 +174,7 @@ extension ObservableDistinctUntilChangedTest {
             completed(250)
             ])
 
-        let res = scheduler.start { xs.distinctUntilChanged({ _ in throw testError }) }
+        let res = scheduler.start { xs.distinctUntilChanged({ (_, _) -> Bool in throw testError }) }
 
         let correctMessages = [
             next(210, 2),
diff --git a/Tests/RxSwiftTests/Observable+DoOnTests.swift b/Tests/RxSwiftTests/Observable+DoOnTests.swift
@@ -400,7 +400,7 @@ extension ObservableDoOnTest {
 
         var didComplete = false
 
-        let res = scheduler.start { xs.do(onCompleted: { error in
+        let res = scheduler.start { xs.do(onCompleted: {
                 didComplete = true
             })
         }
@@ -435,7 +435,7 @@ extension ObservableDoOnTest {
             completed(250)
             ])
 
-        let res = scheduler.start { xs.do(onCompleted: { error in
+        let res = scheduler.start { xs.do(onCompleted: {
                 throw testError
             })
         }
diff --git a/Tests/RxSwiftTests/Observable+MapTests.swift b/Tests/RxSwiftTests/Observable+MapTests.swift
@@ -366,15 +366,15 @@ extension ObservableMapTest {
         }
 
         func testMapWithIndexReleasesResourcesOnComplete() {
-            _ = Observable<Int>.just(1).mapWithIndex { _ in true }.subscribe()
+            _ = Observable<Int>.just(1).mapWithIndex { _, _ in true }.subscribe()
         }
 
         func testMapWithIndex1ReleasesResourcesOnError() {
-            _ = Observable<Int>.error(testError).mapWithIndex { _ in true }.subscribe()
+            _ = Observable<Int>.error(testError).mapWithIndex { _, _ in true }.subscribe()
         }
 
         func testMapWithIndex2ReleasesResourcesOnError() {
-            _ = Observable<Int>.just(1).mapWithIndex { _ -> Bool in throw testError }.subscribe()
+            _ = Observable<Int>.just(1).mapWithIndex { _, _ -> Bool in throw testError }.subscribe()
         }
     #endif
 }
diff --git a/Tests/RxSwiftTests/Observable+MergeTests.swift b/Tests/RxSwiftTests/Observable+MergeTests.swift
@@ -3123,19 +3123,19 @@ extension ObservableMergeTest
 
     #if TRACE_RESOURCES
         func testFlatMapWithIndexReleasesResourcesOnComplete() {
-            _ = Observable<Int>.just(1).flatMapWithIndex { _ in Observable.just(1) }.subscribe()
+            _ = Observable<Int>.just(1).flatMapWithIndex { _, _ in Observable.just(1) }.subscribe()
         }
 
         func testFlatMapWithIndex1ReleasesResourcesOnError() {
-            _ = Observable<Int>.error(testError).flatMapWithIndex { _ in Observable.just(1) }.subscribe()
+            _ = Observable<Int>.error(testError).flatMapWithIndex { _, _ in Observable.just(1) }.subscribe()
         }
 
         func testFlatMapWithIndex2ReleasesResourcesOnError() {
-            _ = Observable<Int>.just(1).flatMapWithIndex { _ -> Observable<Int> in throw testError }.subscribe()
+            _ = Observable<Int>.just(1).flatMapWithIndex { _, _ -> Observable<Int> in throw testError }.subscribe()
         }
 
         func testFlatMapWithIndex3ReleasesResourcesOnError() {
-            _ = Observable<Int>.just(1).flatMapWithIndex { _ -> Observable<Int> in Observable.error(testError) }.subscribe()
+            _ = Observable<Int>.just(1).flatMapWithIndex { _, _ -> Observable<Int> in Observable.error(testError) }.subscribe()
         }
     #endif
 }
diff --git a/Tests/RxSwiftTests/Observable+ScanTests.swift b/Tests/RxSwiftTests/Observable+ScanTests.swift
@@ -184,7 +184,7 @@ extension ObservableScanTest {
         }
 
         func testScan2ReleasesResourcesOnError() {
-            _ = Observable<Int>.just(1).scan(0, accumulator: { _ in throw testError }).subscribe()
+            _ = Observable<Int>.just(1).scan(0, accumulator: { _, _ in throw testError }).subscribe()
         }
     #endif
 }
diff --git a/Tests/RxSwiftTests/Observable+SkipWhileTests.swift b/Tests/RxSwiftTests/Observable+SkipWhileTests.swift
@@ -456,11 +456,11 @@ extension ObservableSkipWhileTest {
         }
 
         func testSkipWhileWithIndexReleasesResourcesOnComplete() {
-            _ = Observable<Int>.just(1).skipWhileWithIndex { _ in true }.subscribe()
+            _ = Observable<Int>.just(1).skipWhileWithIndex { _, _ in true }.subscribe()
         }
 
         func testSkipWhileWithIndexReleasesResourcesOnError() {
-            _ = Observable<Int>.error(testError).skipWhileWithIndex { _ in true }.subscribe()
+            _ = Observable<Int>.error(testError).skipWhileWithIndex { _, _ in true }.subscribe()
         }
     #endif
 }
diff --git a/Tests/RxSwiftTests/Observable+TakeWhileTests.swift b/Tests/RxSwiftTests/Observable+TakeWhileTests.swift
@@ -515,15 +515,15 @@ extension ObservableTakeWhileTest {
         }
 
         func testTakeWhileWithIndexReleasesResourcesOnComplete() {
-            _ = Observable<Int>.just(1).takeWhileWithIndex { _ in true }.subscribe()
+            _ = Observable<Int>.just(1).takeWhileWithIndex { _, _ in true }.subscribe()
         }
 
         func testTakeWhileWithIndex1ReleasesResourcesOnError() {
-            _ = Observable<Int>.error(testError).takeWhileWithIndex { _ in true }.subscribe()
+            _ = Observable<Int>.error(testError).takeWhileWithIndex { _, _ in true }.subscribe()
         }
 
         func testTakeWhileWithIndex2ReleasesResourcesOnError() {
-            _ = Observable<Int>.just(1).takeWhileWithIndex { _ -> Bool in throw testError }.subscribe()
+            _ = Observable<Int>.just(1).takeWhileWithIndex { _, _ -> Bool in throw testError }.subscribe()
         }
     #endif
 }
diff --git a/Tests/RxSwiftTests/Observable+ThrottleTests.swift b/Tests/RxSwiftTests/Observable+ThrottleTests.swift
@@ -174,10 +174,9 @@ extension ObservableThrottleTest {
 
         let end = Date()
 
-        XCTAssertEqualWithAccuracy(0.0, end.timeIntervalSince(start), accuracy: 0.5)
+        XCTAssertEqual(0.0, end.timeIntervalSince(start), accuracy: 0.5)
         XCTAssertEqual(a, [0])
         #endif
-
     }
 
     #if TRACE_RESOURCES
@@ -391,7 +390,7 @@ extension ObservableThrottleTest {
 
         let end = Date()
 
-        XCTAssertEqualWithAccuracy(2, end.timeIntervalSince(start), accuracy: 0.5)
+        XCTAssertEqual(2, end.timeIntervalSince(start), accuracy: 0.5)
         XCTAssertEqual(a, [0, 1])
     }
 
diff --git a/Tests/RxSwiftTests/Observable+TimerTests.swift b/Tests/RxSwiftTests/Observable+TimerTests.swift
diff --git a/Tests/RxSwiftTests/Observable+UsingTests.swift b/Tests/RxSwiftTests/Observable+UsingTests.swift
diff --git a/Tests/RxSwiftTests/SchedulerTests.swift b/Tests/RxSwiftTests/SchedulerTests.swift
diff --git a/Tests/RxSwiftTests/TestImplementations/EquatableArray.swift b/Tests/RxSwiftTests/TestImplementations/EquatableArray.swift

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ extension UITableView : SectionedViewType {`
`51`	`51`	`self.reloadSections(indexSet(sections), with: animationStyle)`
`52`	`52`	`}`
`53`	`53`
`54`		`- public func performBatchUpdates<S: SectionModelType>(_ changes: Changeset<S>, animationConfiguration: AnimationConfiguration) {`
	`54`	`+ public func performBatchUpdates<S>(_ changes: Changeset<S>, animationConfiguration: AnimationConfiguration) {`
`55`	`55`	`self.beginUpdates()`
`56`	`56`	`_performBatchUpdates(self, changes: changes, animationConfiguration: animationConfiguration)`
`57`	`57`	`self.endUpdates()`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ func parseImageURLsfromHTML(_ html: NSString) throws -> [URL] {`
`21`	`21`	`return nil`
`22`	`22`	`}`
`23`	`23`
`24`		`- let url = html.substring(with: match.rangeAt(1))`
	`24`	`+ let url = html.substring(with: match.range(at: 1))`
`25`	`25`
`26`	`26`	`var absoluteURLString = url`
`27`	`27`	`if url.hasPrefix("//") {`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ class DefaultWireframe: Wireframe {`
`37`	`37`	`#if swift(>=4.0)`
`38`	`38`	`NSWorkspace.shared.open(url)`
`39`	`39`	`#else`
`40`		`- NSWorkspace.shared().open(url)`
	`40`	`+ NSWorkspace.shared.open(url)`
`41`	`41`	`#endif`
`42`	`42`	`#endif`
`43`	`43`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ final fileprivate class CombineLatestCollectionType<C: Collection, R> : Producer`
`146`	`146`	`init(sources: C, resultSelector: @escaping ResultSelector) {`
`147`	`147`	`_sources = sources`
`148`	`148`	`_resultSelector = resultSelector`
`149`		`- _count = Int(self._sources.count.toIntMax())`
	`149`	`+ _count = Int(Int64(self._sources.count))`
`150`	`150`	`}`
`151`	`151`
`152`	`152`	`override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ extension Observable {`
`55`	`55`	`*/`
`56`	`56`	`public static func concat<S: Collection >(_ collection: S) -> Observable<Element>`
`57`	`57`	`where S.Iterator.Element == Observable<Element> {`
`58`		`- return Concat(sources: collection, count: collection.count.toIntMax())`
	`58`	`+ return Concat(sources: collection, count: Int64(collection.count))`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`/**`
`@@ -72,7 +72,7 @@ extension Observable {`
`72`	`72`	`- returns: An observable sequence that contains the elements of each given sequence, in sequential order.`
`73`	`73`	`*/`
`74`	`74`	`public static func concat(_ sources: Observable<Element> ...) -> Observable<Element> {`
`75`		`- return Concat(sources: sources, count: sources.count.toIntMax())`
	`75`	`+ return Concat(sources: sources, count: Int64(sources.count))`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ final fileprivate class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {`
`102`	`102`	`}`
`103`	`103`	`}`
`104`	`104`
`105`		`- func run(_ state: Void, recurse: (Void) -> Void) {`
	`105`	`+ func run(_ state: (), _ recurse: (()) -> ()) {`
`106`	`106`	`let (nextEvent, observer) = self._lock.calculateLocked { () -> (Event<E>?, O) in`
`107`	`107`	`if self._queue.count > 0 {`
`108`	`108`	`return (self._queue.dequeue(), self._observer)`