From 1b5cd9ecb50c06fedaee8f91208ee52f4aead419 Mon Sep 17 00:00:00 2001 From: Krunoslav Zaher Date: Thu, 21 Apr 2016 13:33:53 +0200 Subject: [PATCH] Fixing swift 3.0 warnings. --- Preprocessor/Preprocessor/main.swift | 38 ++--- RxCocoa/Common/RxCocoa.swift | 2 +- RxSwift/DataStructures/PriorityQueue.swift | 10 +- RxSwift/Disposables/RefCountDisposable.swift | 4 +- .../SingleAssignmentDisposable.swift | 2 +- .../StableCompositeDisposable.swift | 2 +- RxSwift/Observable+Extensions.swift | 12 +- .../Observables/Implementations/Buffer.swift | 2 +- .../Observables/Implementations/Catch.swift | 24 +-- .../CombineLatest+CollectionType.swift | 14 +- .../Implementations/CombineLatest.swift | 18 +-- .../Observables/Implementations/Concat.swift | 2 +- .../ConnectableObservable.swift | 4 +- .../Observables/Implementations/Debug.swift | 2 +- .../Implementations/Deferred.swift | 6 +- .../Implementations/DelaySubscription.swift | 2 +- .../DistinctUntilChanged.swift | 8 +- RxSwift/Observables/Implementations/Do.swift | 2 +- .../Implementations/ElementAt.swift | 16 +- .../Observables/Implementations/Empty.swift | 2 +- .../Observables/Implementations/Error.swift | 2 +- .../Observables/Implementations/Filter.swift | 2 +- .../Implementations/Generate.swift | 8 +- .../Observables/Implementations/Just.swift | 12 +- RxSwift/Observables/Implementations/Map.swift | 4 +- .../Observables/Implementations/Merge.swift | 62 ++++---- .../Implementations/Multicast.swift | 6 +- .../Implementations/ObserveOn.swift | 8 +- .../ObserveOnSerialDispatchQueue.swift | 2 +- .../Observables/Implementations/Reduce.swift | 2 +- .../Implementations/RetryWhen.swift | 28 ++-- .../Observables/Implementations/Sample.swift | 18 +-- .../Observables/Implementations/Scan.swift | 2 +- .../Implementations/Sequence.swift | 10 +- .../Implementations/ShareReplay1.swift | 16 +- .../ShareReplay1WhileConnected.swift | 18 +-- .../Implementations/SingleAsync.swift | 2 +- .../Observables/Implementations/Sink.swift | 6 +- .../Observables/Implementations/Skip.swift | 18 +-- .../Implementations/SkipUntil.swift | 16 +- .../Implementations/SkipWhile.swift | 18 +-- .../Implementations/SubscribeOn.swift | 2 +- .../Observables/Implementations/Switch.swift | 2 +- .../Observables/Implementations/Take.swift | 4 +- .../Implementations/TakeLast.swift | 10 +- .../Implementations/TakeUntil.swift | 18 +-- .../Implementations/TakeWhile.swift | 4 +- .../Implementations/Throttle.swift | 14 +- .../Observables/Implementations/Timer.swift | 10 +- .../Observables/Implementations/ToArray.swift | 2 +- .../Observables/Implementations/Using.swift | 4 +- .../Observables/Implementations/Window.swift | 34 ++--- .../Implementations/WithLatestFrom.swift | 18 +-- .../Implementations/Zip+CollectionType.swift | 16 +- .../Implementations/Zip+arity.swift | 140 +++++++++--------- .../Observables/Implementations/Zip+arity.tt | 4 +- RxSwift/Observables/Observable+Binding.swift | 8 +- RxSwift/Observables/Observable+Multiple.swift | 4 +- RxSwift/Observables/Observable+Time.swift | 2 +- RxSwift/Observers/ObserverBase.swift | 4 +- RxSwift/Observers/TailRecursiveSink.swift | 14 +- RxSwift/Rx.swift | 2 +- .../Schedulers/ConcurrentMainScheduler.swift | 4 +- .../Schedulers/CurrentThreadScheduler.swift | 14 +- RxSwift/Schedulers/ImmediateScheduler.swift | 2 +- .../Internal/InvocableScheduledItem.swift | 2 +- .../SchedulerServices+Emulation.swift | 8 +- RxSwift/Schedulers/VirtualTimeScheduler.swift | 30 ++-- RxSwift/Subjects/PublishSubject.swift | 18 +-- RxSwift/Subjects/ReplaySubject.swift | 28 ++-- 70 files changed, 427 insertions(+), 427 deletions(-) diff --git a/Preprocessor/Preprocessor/main.swift b/Preprocessor/Preprocessor/main.swift index 42536a17..b8134a87 100644 --- a/Preprocessor/Preprocessor/main.swift +++ b/Preprocessor/Preprocessor/main.swift @@ -19,9 +19,9 @@ let derivedData = Process.arguments[2] let fileManager = NSFileManager() func escape(value: String) -> String { - let escapedString = value.stringByReplacingOccurrencesOfString("\n", withString: "\\n") - let escapedString1 = escapedString.stringByReplacingOccurrencesOfString("\r", withString: "\\r") - let escapedString2 = escapedString1.stringByReplacingOccurrencesOfString("\"", withString: "\\\"") + let escapedString = value.replacingOccurrences(of: "\n", with: "\\n") + let escapedString1 = escapedString.replacingOccurrences(of: "\r", with: "\\r") + let escapedString2 = escapedString1.replacingOccurrences(of: "\"", with: "\\\"") return "\"\(escapedString2)\"" } @@ -30,14 +30,14 @@ func processFile(path: String, outputPath: String) -> String { let rawContent = NSData(contentsOfFile: path)! let content = NSString(data: rawContent, encoding: NSUTF8StringEncoding)! as String - let components = content.componentsSeparatedByString("<%") + let components = content.components(separatedBy: "<%") var functionContentComponents: [String] = [] functionContentComponents.append("var components: [String] = [\"// This file is autogenerated. Take a look at `Preprocessor` target in RxSwift project \\n\"]\n") - functionContentComponents.append("components.append(\(escape(components[0])))\n") + functionContentComponents.append("components.append(\(escape(value: components[0])))\n") for codePlusSuffix in (components[1 ..< components.count]) { - let codePlusSuffixSeparated = codePlusSuffix.componentsSeparatedByString("%>") + let codePlusSuffixSeparated = codePlusSuffix.components(separatedBy: "%>") if codePlusSuffixSeparated.count != 2 { fatalError("Error in \(path) near \(codePlusSuffix)") } @@ -46,18 +46,18 @@ func processFile(path: String, outputPath: String) -> String { let suffix = codePlusSuffixSeparated[1] if code.hasPrefix("=") { - functionContentComponents.append("components.append(String(\(code.substringFromIndex(code.startIndex.successor()))))\n") + functionContentComponents.append("components.append(String(\(code.substring(from: code.startIndex.successor()))))\n") } else { functionContentComponents.append("\(code)\n") } - functionContentComponents.append("components.append(\(escape(suffix)));\n") + functionContentComponents.append("components.append(\(escape(value: suffix)));\n") } functionContentComponents.append("try! components.joinWithSeparator(\"\").writeToFile(\"\(outputPath)\", atomically: false, encoding: NSUTF8StringEncoding)") - return functionContentComponents.joinWithSeparator("") + return functionContentComponents.joined(separator: "") } func runCommand(path: String) { @@ -71,34 +71,34 @@ func runCommand(path: String) { task.waitUntilExit() - if task.terminationReason != NSTaskTerminationReason.Exit { + if task.terminationReason != NSTaskTerminationReason.exit { exit(-1) } } -let files = fileManager.subpathsAtPath(sourceFilesRoot) +let files = try fileManager.subpathsOfDirectory(atPath: sourceFilesRoot) var generateAllFiles = ["// Generated code\n", "import Foundation\n"] -for file in files! { +for file in files { if ((file as NSString).pathExtension ?? "") != "tt" { continue } print(file) - let path = (sourceFilesRoot as NSString).stringByAppendingPathComponent(file as String) + let path = (sourceFilesRoot as NSString).appendingPathComponent(file as String) - let outputPath = path.substringToIndex(path.endIndex.predecessor().predecessor().predecessor()) + ".swift" + let outputPath = path.substring(to: path.endIndex.predecessor().predecessor().predecessor()) + ".swift" - generateAllFiles.append("_ = { () -> Void in\n\(processFile(path, outputPath: outputPath))\n}()\n") + generateAllFiles.append("_ = { () -> Void in\n\(processFile(path: path, outputPath: outputPath))\n}()\n") } -let script = generateAllFiles.joinWithSeparator("") -let scriptPath = (derivedData as NSString).stringByAppendingPathComponent("_preprocessor.sh") +let script = generateAllFiles.joined(separator: "") +let scriptPath = (derivedData as NSString).appendingPathComponent("_preprocessor.sh") do { - try script.writeToFile(scriptPath, atomically: true, encoding: NSUTF8StringEncoding) + try script.write(toFile: scriptPath, atomically: true, encoding: NSUTF8StringEncoding) } catch _ { } -runCommand(scriptPath) \ No newline at end of file +runCommand(path: scriptPath) \ No newline at end of file diff --git a/RxCocoa/Common/RxCocoa.swift b/RxCocoa/Common/RxCocoa.swift index 99c62a92..5c08085e 100644 --- a/RxCocoa/Common/RxCocoa.swift +++ b/RxCocoa/Common/RxCocoa.swift @@ -335,7 +335,7 @@ extension NSError { #if !RX_NO_MODULE -@noreturn func rxFatalError(lastMessage: String) { +@noreturn func rxFatalError(_ lastMessage: String) { // The temptation to comment this line is great, but please don't, it's for your own good. The choice is yours. fatalError(lastMessage) } diff --git a/RxSwift/DataStructures/PriorityQueue.swift b/RxSwift/DataStructures/PriorityQueue.swift index efbd546a..84d29524 100644 --- a/RxSwift/DataStructures/PriorityQueue.swift +++ b/RxSwift/DataStructures/PriorityQueue.swift @@ -18,7 +18,7 @@ struct PriorityQueue { mutating func enqueue(element: Element) { _elements.append(element) - bubbleToHigherPriority(_elements.count - 1) + bubbleToHigherPriority(initialUnbalancedIndex: _elements.count - 1) } func peek() -> Element? { @@ -34,7 +34,7 @@ struct PriorityQueue { return nil } - removeAt(0) + removeAt(index: 0) return front } @@ -42,7 +42,7 @@ struct PriorityQueue { mutating func remove(element: Element) { for i in 0 ..< _elements.count { if _elements[i] === element { - removeAt(i) + removeAt(index: i) return } } @@ -57,8 +57,8 @@ struct PriorityQueue { _elements.popLast() if !removingLast { - bubbleToHigherPriority(index) - bubbleToLowerPriority(index) + bubbleToHigherPriority(initialUnbalancedIndex: index) + bubbleToLowerPriority(initialUnbalancedIndex: index) } } diff --git a/RxSwift/Disposables/RefCountDisposable.swift b/RxSwift/Disposables/RefCountDisposable.swift index 2d29d74a..044f1a70 100644 --- a/RxSwift/Disposables/RefCountDisposable.swift +++ b/RxSwift/Disposables/RefCountDisposable.swift @@ -43,7 +43,7 @@ public class RefCountDisposable : DisposeBase, Cancelable { if let _ = _disposable { do { - try incrementChecked(&_count) + try incrementChecked(i: &_count) } catch (_) { rxFatalError("RefCountDisposable increment failed") } @@ -83,7 +83,7 @@ public class RefCountDisposable : DisposeBase, Cancelable { let oldDisposable: Disposable? = _lock.calculateLocked { if let oldDisposable = _disposable { do { - try decrementChecked(&_count) + try decrementChecked(i: &_count) } catch (_) { rxFatalError("RefCountDisposable decrement on release failed") } diff --git a/RxSwift/Disposables/SingleAssignmentDisposable.swift b/RxSwift/Disposables/SingleAssignmentDisposable.swift index 9fedf5f5..eecceba8 100644 --- a/RxSwift/Disposables/SingleAssignmentDisposable.swift +++ b/RxSwift/Disposables/SingleAssignmentDisposable.swift @@ -46,7 +46,7 @@ public class SingleAssignmentDisposable : DisposeBase, Disposable, Cancelable { return _disposable ?? NopDisposable.instance } set { - _setDisposable(newValue)?.dispose() + _setDisposable(newValue: newValue)?.dispose() } } diff --git a/RxSwift/Disposables/StableCompositeDisposable.swift b/RxSwift/Disposables/StableCompositeDisposable.swift index 54162d2e..7098867c 100644 --- a/RxSwift/Disposables/StableCompositeDisposable.swift +++ b/RxSwift/Disposables/StableCompositeDisposable.swift @@ -9,7 +9,7 @@ import Foundation public final class StableCompositeDisposable { - public static func create(disposable1: Disposable, _ disposable2: Disposable) -> Disposable { + public static func create(_ disposable1: Disposable, _ disposable2: Disposable) -> Disposable { return BinaryDisposable(disposable1, disposable2) } } \ No newline at end of file diff --git a/RxSwift/Observable+Extensions.swift b/RxSwift/Observable+Extensions.swift index 2ac06b46..0f6141e2 100644 --- a/RxSwift/Observable+Extensions.swift +++ b/RxSwift/Observable+Extensions.swift @@ -21,7 +21,7 @@ extension ObservableType { let observer = AnonymousObserver { e in on(event: e) } - return self.subscribeSafe(observer) + return self.subscribeSafe(observer: observer) } /** @@ -60,7 +60,7 @@ extension ObservableType { } } return BinaryDisposable( - self.subscribeSafe(observer), + self.subscribeSafe(observer: observer), disposable ) } @@ -79,7 +79,7 @@ extension ObservableType { onNext(value) } } - return self.subscribeSafe(observer) + return self.subscribeSafe(observer: observer) } /** @@ -96,7 +96,7 @@ extension ObservableType { onError(error) } } - return self.subscribeSafe(observer) + return self.subscribeSafe(observer: observer) } /** @@ -113,7 +113,7 @@ extension ObservableType { onCompleted() } } - return self.subscribeSafe(observer) + return self.subscribeSafe(observer: observer) } } @@ -123,6 +123,6 @@ public extension ObservableType { */ @warn_unused_result(message: "http://git.io/rxs.ud") func subscribeSafe(observer: O) -> Disposable { - return self.asObservable().subscribe(observer) + return self.asObservable().subscribe(observer: observer) } } diff --git a/RxSwift/Observables/Implementations/Buffer.swift b/RxSwift/Observables/Implementations/Buffer.swift index 2da636d5..999eb682 100644 --- a/RxSwift/Observables/Implementations/Buffer.swift +++ b/RxSwift/Observables/Implementations/Buffer.swift @@ -53,7 +53,7 @@ class BufferTimeCountSink func run() -> Disposable { createTimer(_windowID) - return StableCompositeDisposable.create(_timerD, _parent._source.subscribe(self)) + return StableCompositeDisposable.create(_timerD, _parent._source.subscribe(observer: self)) } func startNewWindowAndSendCurrentOne() { diff --git a/RxSwift/Observables/Implementations/Catch.swift b/RxSwift/Observables/Implementations/Catch.swift index 34f666ca..a64b3942 100644 --- a/RxSwift/Observables/Implementations/Catch.swift +++ b/RxSwift/Observables/Implementations/Catch.swift @@ -21,7 +21,7 @@ class CatchSinkProxy : ObserverType { } func on(event: Event) { - _parent.forwardOn(event) + _parent.forwardOn(event: event) switch event { case .Next: @@ -47,7 +47,7 @@ class CatchSink : Sink, ObserverType { func run() -> Disposable { let d1 = SingleAssignmentDisposable() _subscription.disposable = d1 - d1.disposable = _parent._source.subscribe(self) + d1.disposable = _parent._source.subscribe(observer: self) return _subscription } @@ -55,9 +55,9 @@ class CatchSink : Sink, ObserverType { func on(event: Event) { switch event { case .Next: - forwardOn(event) + forwardOn(event: event) case .Completed: - forwardOn(event) + forwardOn(event: event) dispose() case .Error(let error): do { @@ -68,7 +68,7 @@ class CatchSink : Sink, ObserverType { _subscription.disposable = catchSequence.subscribe(observer) } catch let e { - forwardOn(.Error(e)) + forwardOn(event: .Error(e)) dispose() } } @@ -110,26 +110,26 @@ class CatchSequenceSink) { switch event { case .Next: - forwardOn(event) + forwardOn(event: event) case .Error(let error): _lastError = error - schedule(.MoveNext) + schedule(command: .MoveNext) case .Completed: - forwardOn(event) + forwardOn(event: event) dispose() } } override func subscribeToNext(source: Observable) -> Disposable { - return source.subscribe(self) + return source.subscribe(observer: self) } override func done() { if let lastError = _lastError { - forwardOn(.Error(lastError)) + forwardOn(event: .Error(lastError)) } else { - forwardOn(.Completed) + forwardOn(event: .Completed) } self.dispose() @@ -156,7 +156,7 @@ class CatchSequence(observer: O) -> Disposable { let sink = CatchSequenceSink(observer: observer) - sink.disposable = sink.run((self.sources.makeIterator(), nil)) + sink.disposable = sink.run(sources: (self.sources.makeIterator(), nil)) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift b/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift index d3eb9a5a..b91e6444 100644 --- a/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift +++ b/RxSwift/Observables/Implementations/CombineLatest+CollectionType.swift @@ -51,7 +51,7 @@ class CombineLatestCollectionTypeSink if _numberOfValues == _arity { do { let result = try getResult() - forwardOn(.Next(result)) + forwardOn(event: .Next(result)) } catch let e { - forwardOn(.Error(e)) + forwardOn(event: .Error(e)) dispose() } } @@ -66,14 +66,14 @@ class CombineLatestSink } if allOthersDone { - forwardOn(.Completed) + forwardOn(event: .Completed) dispose() } } } func fail(error: ErrorProtocol) { - forwardOn(.Error(error)) + forwardOn(event: .Error(error)) dispose() } @@ -86,7 +86,7 @@ class CombineLatestSink _numberOfDone += 1 if _numberOfDone == _arity { - forwardOn(.Completed) + forwardOn(event: .Completed) dispose() } } @@ -115,20 +115,20 @@ class CombineLatestObserver } func on(event: Event) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { switch event { case .Next(let value): _setLatestValue(value) - _parent.next(_index) + _parent.next(index: _index) case .Error(let error): _this.dispose() - _parent.fail(error) + _parent.fail(error: error) case .Completed: _this.dispose() - _parent.done(_index) + _parent.done(index: _index) } } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Concat.swift b/RxSwift/Observables/Implementations/Concat.swift index 244170b3..425a6669 100644 --- a/RxSwift/Observables/Implementations/Concat.swift +++ b/RxSwift/Observables/Implementations/Concat.swift @@ -31,7 +31,7 @@ class ConcatSink) -> Disposable { - return source.subscribe(self) + return source.subscribe(observer: self) } override func extract(observable: Observable) -> SequenceGenerator? { diff --git a/RxSwift/Observables/Implementations/ConnectableObservable.swift b/RxSwift/Observables/Implementations/ConnectableObservable.swift index ce78baba..a08ce28d 100644 --- a/RxSwift/Observables/Implementations/ConnectableObservable.swift +++ b/RxSwift/Observables/Implementations/ConnectableObservable.swift @@ -83,7 +83,7 @@ class ConnectableObservableAdapter return connection } - let disposable = _source.subscribe(_subject.asObserver()) + let disposable = _source.subscribe(observer: _subject.asObserver()) let connection = Connection(parent: self, lock: _lock, subscription: disposable) _connection = connection return connection @@ -91,6 +91,6 @@ class ConnectableObservableAdapter } override func subscribe(observer: O) -> Disposable { - return _subject.subscribe(observer) + return _subject.subscribe(observer: observer) } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Debug.swift b/RxSwift/Observables/Implementations/Debug.swift index d90d1981..cc58a61f 100644 --- a/RxSwift/Observables/Implementations/Debug.swift +++ b/RxSwift/Observables/Implementations/Debug.swift @@ -71,7 +71,7 @@ class Debug : Producer { override func run(observer: O) -> Disposable { let sink = Debug_(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Deferred.swift b/RxSwift/Observables/Implementations/Deferred.swift index 31c6f2bb..7122b0a7 100644 --- a/RxSwift/Observables/Implementations/Deferred.swift +++ b/RxSwift/Observables/Implementations/Deferred.swift @@ -21,17 +21,17 @@ class DeferredSink : Sink Disposable { do { let result = try _observableFactory() - return result.subscribe(self) + return result.subscribe(observer: self) } catch let e { - forwardOn(.Error(e)) + forwardOn(event: .Error(e)) dispose() return NopDisposable.instance } } func on(event: Event) { - forwardOn(event) + forwardOn(event: event) switch event { case .Next: diff --git a/RxSwift/Observables/Implementations/DelaySubscription.swift b/RxSwift/Observables/Implementations/DelaySubscription.swift index 3dc62acd..5ebf32a0 100644 --- a/RxSwift/Observables/Implementations/DelaySubscription.swift +++ b/RxSwift/Observables/Implementations/DelaySubscription.swift @@ -44,7 +44,7 @@ class DelaySubscription: Producer { override func run(observer: O) -> Disposable { let sink = DelaySubscriptionSink(parent: self, observer: observer) sink.disposable = _scheduler.scheduleRelative((), dueTime: _dueTime) { _ in - return self._source.subscribe(sink) + return self._source.subscribe(observer: sink) } return sink diff --git a/RxSwift/Observables/Implementations/DistinctUntilChanged.swift b/RxSwift/Observables/Implementations/DistinctUntilChanged.swift index 9f03da46..b943cd13 100644 --- a/RxSwift/Observables/Implementations/DistinctUntilChanged.swift +++ b/RxSwift/Observables/Implementations/DistinctUntilChanged.swift @@ -35,14 +35,14 @@ class DistinctUntilChangedSink: Sink, ObserverType { _currentKey = key - forwardOn(event) + forwardOn(event: event) } catch let error { - forwardOn(.Error(error)) + forwardOn(event: .Error(error)) dispose() } case .Error, .Completed: - forwardOn(event) + forwardOn(event: event) dispose() } } @@ -64,7 +64,7 @@ class DistinctUntilChanged: Producer { override func run(observer: O) -> Disposable { let sink = DistinctUntilChangedSink(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Do.swift b/RxSwift/Observables/Implementations/Do.swift index 719f2bb5..0ad3c79a 100644 --- a/RxSwift/Observables/Implementations/Do.swift +++ b/RxSwift/Observables/Implementations/Do.swift @@ -47,7 +47,7 @@ class Do : Producer { override func run(observer: O) -> Disposable { let sink = DoSink(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/ElementAt.swift b/RxSwift/Observables/Implementations/ElementAt.swift index 4360afb1..1c137137 100644 --- a/RxSwift/Observables/Implementations/ElementAt.swift +++ b/RxSwift/Observables/Implementations/ElementAt.swift @@ -27,27 +27,27 @@ class ElementAtSink : Sink< case .Next(_): if (_i == 0) { - forwardOn(event) - forwardOn(.Completed) + forwardOn(event: event) + forwardOn(event: .Completed) self.dispose() } do { - try decrementChecked(&_i) + try decrementChecked(i: &_i) } catch(let e) { - forwardOn(.Error(e)) + forwardOn(event: .Error(e)) dispose() return } case .Error(let e): - forwardOn(.Error(e)) + forwardOn(event: .Error(e)) self.dispose() case .Completed: if (_parent._throwOnEmpty) { - forwardOn(.Error(RxError.ArgumentOutOfRange)) + forwardOn(event: .Error(RxError.ArgumentOutOfRange)) } else { - forwardOn(.Completed) + forwardOn(event: .Completed) } self.dispose() @@ -73,7 +73,7 @@ class ElementAt : Producer { override func run(observer: O) -> Disposable { let sink = ElementAtSink(parent: self, observer: observer) - sink.disposable = _source.subscribeSafe(sink) + sink.disposable = _source.subscribeSafe(observer: sink) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Empty.swift b/RxSwift/Observables/Implementations/Empty.swift index d2ebb188..15a6b826 100644 --- a/RxSwift/Observables/Implementations/Empty.swift +++ b/RxSwift/Observables/Implementations/Empty.swift @@ -10,7 +10,7 @@ import Foundation class Empty : Producer { override func subscribe(observer: O) -> Disposable { - observer.on(.Completed) + observer.on(event: .Completed) return NopDisposable.instance } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Error.swift b/RxSwift/Observables/Implementations/Error.swift index d5c97216..0f84d4e7 100644 --- a/RxSwift/Observables/Implementations/Error.swift +++ b/RxSwift/Observables/Implementations/Error.swift @@ -16,7 +16,7 @@ class Error : Producer { } override func subscribe(observer: O) -> Disposable { - observer.on(.Error(_error)) + observer.on(event: .Error(_error)) return NopDisposable.instance } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Filter.swift b/RxSwift/Observables/Implementations/Filter.swift index b78fafb3..f94f3998 100644 --- a/RxSwift/Observables/Implementations/Filter.swift +++ b/RxSwift/Observables/Implementations/Filter.swift @@ -54,7 +54,7 @@ class Filter : Producer { override func run(observer: O) -> Disposable { let sink = FilterSink(predicate: _predicate, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Generate.swift b/RxSwift/Observables/Implementations/Generate.swift index 8321f944..ad59b6a9 100644 --- a/RxSwift/Observables/Implementations/Generate.swift +++ b/RxSwift/Observables/Implementations/Generate.swift @@ -22,7 +22,7 @@ class GenerateSink : Sink { } func run() -> Disposable { - return _parent._scheduler.scheduleRecursive(true) { (isFirst, recurse) -> Void in + return _parent._scheduler.scheduleRecursive(state: true) { (isFirst, recurse) -> Void in do { if !isFirst { self._state = try self._parent._iterate(self._state) @@ -30,17 +30,17 @@ class GenerateSink : Sink { if try self._parent._condition(self._state) { let result = try self._parent._resultSelector(self._state) - self.forwardOn(.Next(result)) + self.forwardOn(event: .Next(result)) recurse(false) } else { - self.forwardOn(.Completed) + self.forwardOn(event: .Completed) self.dispose() } } catch let error { - self.forwardOn(.Error(error)) + self.forwardOn(event: .Error(error)) self.dispose() } } diff --git a/RxSwift/Observables/Implementations/Just.swift b/RxSwift/Observables/Implementations/Just.swift index 280827ae..76e8ee44 100644 --- a/RxSwift/Observables/Implementations/Just.swift +++ b/RxSwift/Observables/Implementations/Just.swift @@ -20,10 +20,10 @@ class JustScheduledSink : Sink { func run() -> Disposable { let scheduler = _parent._scheduler - return scheduler.schedule(_parent._element) { element in - self.forwardOn(.Next(element)) - return scheduler.schedule(()) { _ in - self.forwardOn(.Completed) + return scheduler.schedule(state: _parent._element) { element in + self.forwardOn(event: .Next(element)) + return scheduler.schedule(state: ()) { _ in + self.forwardOn(event: .Completed) return NopDisposable.instance } } @@ -54,8 +54,8 @@ class Just : Producer { } override func subscribe(observer: O) -> Disposable { - observer.on(.Next(_element)) - observer.on(.Completed) + observer.on(event: .Next(_element)) + observer.on(event: .Completed) return NopDisposable.instance } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Map.swift b/RxSwift/Observables/Implementations/Map.swift index a4dc3795..ab016ebd 100644 --- a/RxSwift/Observables/Implementations/Map.swift +++ b/RxSwift/Observables/Implementations/Map.swift @@ -93,7 +93,7 @@ class MapWithIndex : Producer { override func run(observer: O) -> Disposable { let sink = MapWithIndexSink(selector: _selector, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } @@ -128,7 +128,7 @@ class Map: Producer { override func run(observer: O) -> Disposable { let sink = MapSink(selector: _selector, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } diff --git a/RxSwift/Observables/Implementations/Merge.swift b/RxSwift/Observables/Implementations/Merge.swift index a7b90bbc..5fbb43d3 100644 --- a/RxSwift/Observables/Implementations/Merge.swift +++ b/RxSwift/Observables/Implementations/Merge.swift @@ -31,7 +31,7 @@ class MergeLimitedSinkIter) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { @@ -39,18 +39,18 @@ class MergeLimitedSinkIter) -> Disposable { - _group.addDisposable(_sourceSubscription) + _group.addDisposable(disposable: _sourceSubscription) - let disposable = source.subscribe(self) + let disposable = source.subscribe(observer: self) _sourceSubscription.disposable = disposable return _group } @@ -96,7 +96,7 @@ class MergeLimitedSink) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { @@ -119,19 +119,19 @@ class MergeLimitedSink : Producer { override func run(observer: O) -> Disposable { let sink = MergeLimitedSink(maxConcurrent: _maxConcurrent, observer: observer) - sink.disposable = sink.run(_source) + sink.disposable = sink.run(source: _source) return sink } } @@ -200,7 +200,7 @@ final class FlatMapWithIndexSink S { - return try _selector(element, try incrementChecked(&_index)) + return try _selector(element, try incrementChecked(i: &_index)) } } @@ -245,15 +245,15 @@ class MergeSinkIter) { let iterDisposable = SingleAssignmentDisposable() - if let disposeKey = _group.addDisposable(iterDisposable) { + if let disposeKey = _group.addDisposable(disposable: iterDisposable) { let iter = MergeSinkIter(parent: self, disposeKey: disposeKey) let subscription = source.subscribe(iter) iterDisposable.disposable = subscription @@ -339,9 +339,9 @@ class MergeSink) -> Disposable { - _group.addDisposable(_sourceSubscription) + _group.addDisposable(disposable: _sourceSubscription) - let subscription = source.subscribe(self) + let subscription = source.subscribe(observer: self) _sourceSubscription.disposable = subscription return _group @@ -364,7 +364,7 @@ final class FlatMap: Producer { override func run(observer: O) -> Disposable { let sink = FlatMapSink(selector: _selector, observer: observer) - sink.disposable = sink.run(_source) + sink.disposable = sink.run(source: _source) return sink } } @@ -383,7 +383,7 @@ final class FlatMapWithIndex: Producer override func run(observer: O) -> Disposable { let sink = FlatMapWithIndexSink(selector: _selector, observer: observer) - sink.disposable = sink.run(_source) + sink.disposable = sink.run(source: _source) return sink } @@ -403,7 +403,7 @@ final class FlatMapFirst: Producer(observer: O) -> Disposable { let sink = FlatMapFirstSink(selector: _selector, observer: observer) - sink.disposable = sink.run(_source) + sink.disposable = sink.run(source: _source) return sink } } @@ -417,7 +417,7 @@ final class Merge : Producer { override func run(observer: O) -> Disposable { let sink = MergeBasicSink(observer: observer) - sink.disposable = sink.run(_source) + sink.disposable = sink.run(source: _source) return sink } } diff --git a/RxSwift/Observables/Implementations/Multicast.swift b/RxSwift/Observables/Implementations/Multicast.swift index fd8bfd69..673e7676 100644 --- a/RxSwift/Observables/Implementations/Multicast.swift +++ b/RxSwift/Observables/Implementations/Multicast.swift @@ -27,20 +27,20 @@ class MulticastSink: Sink, ObserverType { let observable = try _parent._selector(connectable) - let subscription = observable.subscribe(self) + let subscription = observable.subscribe(observer: self) let connection = connectable.connect() return BinaryDisposable(subscription, connection) } catch let e { - forwardOn(.Error(e)) + forwardOn(event: .Error(e)) dispose() return NopDisposable.instance } } func on(event: Event) { - forwardOn(event) + forwardOn(event: event) switch event { case .Next: break case .Error, .Completed: diff --git a/RxSwift/Observables/Implementations/ObserveOn.swift b/RxSwift/Observables/Implementations/ObserveOn.swift index c0fb46d6..f7efd2cd 100644 --- a/RxSwift/Observables/Implementations/ObserveOn.swift +++ b/RxSwift/Observables/Implementations/ObserveOn.swift @@ -23,7 +23,7 @@ class ObserveOn : Producer { override func run(observer: O) -> Disposable { let sink = ObserveOnSink(scheduler: scheduler, observer: observer) - sink._subscription.disposable = source.subscribe(sink) + sink._subscription.disposable = source.subscribe(observer: sink) return sink } @@ -63,7 +63,7 @@ class ObserveOnSink : ObserverBase { override func onCore(event: Event) { let shouldStart = _lock.calculateLocked { () -> Bool in - self._queue.enqueue(event) + self._queue.enqueue(element: event) switch self._state { case .Stopped: @@ -75,7 +75,7 @@ class ObserveOnSink : ObserverBase { } if shouldStart { - _scheduleDisposable.disposable = self._scheduler.scheduleRecursive((), action: self.run) + _scheduleDisposable.disposable = self._scheduler.scheduleRecursive(state: (), action: self.run) } } @@ -91,7 +91,7 @@ class ObserveOnSink : ObserverBase { } if let nextEvent = nextEvent { - observer?.on(nextEvent) + observer?.on(event: nextEvent) if nextEvent.isStopEvent { dispose() } diff --git a/RxSwift/Observables/Implementations/ObserveOnSerialDispatchQueue.swift b/RxSwift/Observables/Implementations/ObserveOnSerialDispatchQueue.swift index f051f823..7847a248 100644 --- a/RxSwift/Observables/Implementations/ObserveOnSerialDispatchQueue.swift +++ b/RxSwift/Observables/Implementations/ObserveOnSerialDispatchQueue.swift @@ -68,7 +68,7 @@ class ObserveOnSerialDispatchQueue : Producer { override func run(observer: O) -> Disposable { let sink = ObserveOnSerialDispatchQueueSink(scheduler: scheduler, observer: observer) - sink.subscription.disposable = source.subscribe(sink) + sink.subscription.disposable = source.subscribe(observer: sink) return sink } diff --git a/RxSwift/Observables/Implementations/Reduce.swift b/RxSwift/Observables/Implementations/Reduce.swift index 10e03b8a..3599faec 100644 --- a/RxSwift/Observables/Implementations/Reduce.swift +++ b/RxSwift/Observables/Implementations/Reduce.swift @@ -68,7 +68,7 @@ class Reduce : Producer { override func run(observer: O) -> Disposable { let sink = ReduceSink(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/RetryWhen.swift b/RxSwift/Observables/Implementations/RetryWhen.swift index bf6e8c14..5138f86c 100644 --- a/RxSwift/Observables/Implementations/RetryWhen.swift +++ b/RxSwift/Observables/Implementations/RetryWhen.swift @@ -24,12 +24,12 @@ class RetryTriggerSink) { switch event { case .Next: - _parent.forwardOn(event) + _parent.forwardOn(event: event) case .Error(let error): _parent._lastError = error @@ -59,16 +59,16 @@ class RetryWhenSequenceSinkIter) -> Disposable { let iter = RetryWhenSequenceSinkIter(parent: self) - iter.disposable = source.subscribe(iter) + iter.disposable = source.subscribe(observer: iter) return iter } override func run(sources: SequenceGenerator) -> Disposable { - let triggerSubscription = _handler.subscribe(_notifier.asObserver()) - let superSubscription = super.run(sources) + let triggerSubscription = _handler.subscribe(observer: _notifier.asObserver()) + let superSubscription = super.run(sources: sources) return StableCompositeDisposable.create(superSubscription, triggerSubscription) } } @@ -144,7 +144,7 @@ class RetryWhenSequence(observer: O) -> Disposable { let sink = RetryWhenSequenceSink(parent: self, observer: observer) - sink.disposable = sink.run((self._sources.makeIterator(), nil)) + sink.disposable = sink.run(sources: (self._sources.makeIterator(), nil)) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Sample.swift b/RxSwift/Observables/Implementations/Sample.swift index a8f0ad43..fa4c2f67 100644 --- a/RxSwift/Observables/Implementations/Sample.swift +++ b/RxSwift/Observables/Implementations/Sample.swift @@ -27,7 +27,7 @@ class SamplerSink) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { @@ -38,23 +38,23 @@ class SamplerSink } func run() -> Disposable { - _sourceSubscription.disposable = _parent._source.subscribe(self) + _sourceSubscription.disposable = _parent._source.subscribe(observer: self) let samplerSubscription = _parent._sampler.subscribe(SamplerSink(parent: self)) return StableCompositeDisposable.create(_sourceSubscription, samplerSubscription) } func on(event: Event) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { @@ -100,7 +100,7 @@ class SampleSequenceSink case .Next(let element): _element = element case .Error: - forwardOn(event) + forwardOn(event: event) dispose() case .Completed: _atEnd = true diff --git a/RxSwift/Observables/Implementations/Scan.swift b/RxSwift/Observables/Implementations/Scan.swift index 958dd694..21b2fd1f 100644 --- a/RxSwift/Observables/Implementations/Scan.swift +++ b/RxSwift/Observables/Implementations/Scan.swift @@ -58,7 +58,7 @@ class Scan: Producer { override func run(observer: O) -> Disposable { let sink = ScanSink(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Sequence.swift b/RxSwift/Observables/Implementations/Sequence.swift index eee8fda2..a759e5f5 100644 --- a/RxSwift/Observables/Implementations/Sequence.swift +++ b/RxSwift/Observables/Implementations/Sequence.swift @@ -19,13 +19,13 @@ class ObservableSequenceSink : Sink { } func run() -> Disposable { - return _parent._scheduler!.scheduleRecursive((0, _parent._elements)) { (state, recurse) in + return _parent._scheduler!.scheduleRecursive(state: (0, _parent._elements)) { (state, recurse) in if state.0 < state.1.count { - self.forwardOn(.Next(state.1[state.0])) + self.forwardOn(event: .Next(state.1[state.0])) recurse((state.0 + 1, state.1)) } else { - self.forwardOn(.Completed) + self.forwardOn(event: .Completed) } } } @@ -44,10 +44,10 @@ class ObservableSequence : Producer { // optimized version without scheduler guard _scheduler != nil else { for element in _elements { - observer.on(.Next(element)) + observer.on(event: .Next(element)) } - observer.on(.Completed) + observer.on(event: .Completed) return NopDisposable.instance } diff --git a/RxSwift/Observables/Implementations/ShareReplay1.swift b/RxSwift/Observables/Implementations/ShareReplay1.swift index 52cb5ebe..67a84d1d 100644 --- a/RxSwift/Observables/Implementations/ShareReplay1.swift +++ b/RxSwift/Observables/Implementations/ShareReplay1.swift @@ -32,7 +32,7 @@ final class ShareReplay1 override func subscribe(observer: O) -> Disposable { _lock.lock(); defer { _lock.unlock() } - return _synchronized_subscribe(observer) + return _synchronized_subscribe(observer: observer) } func _synchronized_subscribe(observer: O) -> Disposable { @@ -41,19 +41,19 @@ final class ShareReplay1 } if let stopEvent = self._stopEvent { - observer.on(stopEvent) + observer.on(event: stopEvent) return NopDisposable.instance } let initialCount = self._observers.count - let disposeKey = self._observers.insert(AnyObserver(observer)) + let disposeKey = self._observers.insert(element: AnyObserver(observer)) if initialCount == 0 { let connection = SingleAssignmentDisposable() _connection = connection - connection.disposable = self._source.subscribe(self) + connection.disposable = self._source.subscribe(observer: self) } return SubscriptionDisposable(owner: self, key: disposeKey) @@ -61,12 +61,12 @@ final class ShareReplay1 func synchronizedUnsubscribe(disposeKey: DisposeKey) { _lock.lock(); defer { _lock.unlock() } - _synchronized_unsubscribe(disposeKey) + _synchronized_unsubscribe(disposeKey: disposeKey) } func _synchronized_unsubscribe(disposeKey: DisposeKey) { // if already unsubscribed, just return - if self._observers.removeKey(disposeKey) == nil { + if self._observers.removeKey(key: disposeKey) == nil { return } @@ -78,7 +78,7 @@ final class ShareReplay1 func on(event: Event) { _lock.lock(); defer { _lock.unlock() } - _synchronized_on(event) + _synchronized_on(event: event) } func _synchronized_on(event: Event) { @@ -96,6 +96,6 @@ final class ShareReplay1 _connection = nil } - _observers.on(event) + _observers.on(event: event) } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/ShareReplay1WhileConnected.swift b/RxSwift/Observables/Implementations/ShareReplay1WhileConnected.swift index af776b1c..46de4b30 100644 --- a/RxSwift/Observables/Implementations/ShareReplay1WhileConnected.swift +++ b/RxSwift/Observables/Implementations/ShareReplay1WhileConnected.swift @@ -30,23 +30,23 @@ final class ShareReplay1WhileConnected override func subscribe(observer: O) -> Disposable { _lock.lock(); defer { _lock.unlock() } - return _synchronized_subscribe(observer) + return _synchronized_subscribe(observer: observer) } func _synchronized_subscribe(observer: O) -> Disposable { if let element = self._element { - observer.on(.Next(element)) + observer.on(event: .Next(element)) } let initialCount = self._observers.count - let disposeKey = self._observers.insert(AnyObserver(observer)) + let disposeKey = self._observers.insert(element: AnyObserver(observer)) if initialCount == 0 { let connection = SingleAssignmentDisposable() _connection = connection - connection.disposable = self._source.subscribe(self) + connection.disposable = self._source.subscribe(observer: self) } return SubscriptionDisposable(owner: self, key: disposeKey) @@ -54,12 +54,12 @@ final class ShareReplay1WhileConnected func synchronizedUnsubscribe(disposeKey: DisposeKey) { _lock.lock(); defer { _lock.unlock() } - _synchronized_unsubscribe(disposeKey) + _synchronized_unsubscribe(disposeKey: disposeKey) } func _synchronized_unsubscribe(disposeKey: DisposeKey) { // if already unsubscribed, just return - if self._observers.removeKey(disposeKey) == nil { + if self._observers.removeKey(key: disposeKey) == nil { return } @@ -72,21 +72,21 @@ final class ShareReplay1WhileConnected func on(event: Event) { _lock.lock(); defer { _lock.unlock() } - _synchronized_on(event) + _synchronized_on(event: event) } func _synchronized_on(event: Event) { switch event { case .Next(let element): _element = element - _observers.on(event) + _observers.on(event: event) case .Error, .Completed: _element = nil _connection?.dispose() _connection = nil let observers = _observers _observers = Bag() - observers.on(event) + observers.on(event: event) } } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/SingleAsync.swift b/RxSwift/Observables/Implementations/SingleAsync.swift index 89d25f72..eee96754 100644 --- a/RxSwift/Observables/Implementations/SingleAsync.swift +++ b/RxSwift/Observables/Implementations/SingleAsync.swift @@ -70,7 +70,7 @@ class SingleAsync: Producer { override func run(observer: O) -> Disposable { let sink = SingleAsyncSink(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Sink.swift b/RxSwift/Observables/Implementations/Sink.swift index dff961f2..1599e670 100644 --- a/RxSwift/Observables/Implementations/Sink.swift +++ b/RxSwift/Observables/Implementations/Sink.swift @@ -22,7 +22,7 @@ class Sink : SingleAssignmentDisposable { if disposed { return } - _observer.on(event) + _observer.on(event: event) } final func forwarder() -> SinkForward { @@ -48,9 +48,9 @@ class SinkForward: ObserverType { func on(event: Event) { switch event { case .Next: - _forward._observer.on(event) + _forward._observer.on(event: event) case .Error, .Completed: - _forward._observer.on(event) + _forward._observer.on(event: event) _forward.dispose() } } diff --git a/RxSwift/Observables/Implementations/Skip.swift b/RxSwift/Observables/Implementations/Skip.swift index 2c1bf400..7acdc366 100644 --- a/RxSwift/Observables/Implementations/Skip.swift +++ b/RxSwift/Observables/Implementations/Skip.swift @@ -29,16 +29,16 @@ class SkipCountSink : Sin case .Next(let value): if remaining <= 0 { - forwardOn(.Next(value)) + forwardOn(event: .Next(value)) } else { remaining -= 1 } case .Error: - forwardOn(event) + forwardOn(event: event) self.dispose() case .Completed: - forwardOn(event) + forwardOn(event: event) self.dispose() } } @@ -56,7 +56,7 @@ class SkipCount: Producer { override func run(observer: O) -> Disposable { let sink = SkipCountSink(parent: self, observer: observer) - sink.disposable = source.subscribe(sink) + sink.disposable = source.subscribe(observer: sink) return sink } @@ -82,13 +82,13 @@ class SkipTimeSink : Sink switch event { case .Next(let value): if open { - forwardOn(.Next(value)) + forwardOn(event: .Next(value)) } case .Error: - forwardOn(event) + forwardOn(event: event) self.dispose() case .Completed: - forwardOn(event) + forwardOn(event: event) self.dispose() } } @@ -98,12 +98,12 @@ class SkipTimeSink : Sink } func run() -> Disposable { - let disposeTimer = parent.scheduler.scheduleRelative((), dueTime: self.parent.duration) { + let disposeTimer = parent.scheduler.scheduleRelative(state: (), dueTime: self.parent.duration) { self.tick() return NopDisposable.instance } - let disposeSubscription = parent.source.subscribe(self) + let disposeSubscription = parent.source.subscribe(observer: self) return BinaryDisposable(disposeTimer, disposeSubscription) } diff --git a/RxSwift/Observables/Implementations/SkipUntil.swift b/RxSwift/Observables/Implementations/SkipUntil.swift index 97c7680d..b3c79e0d 100644 --- a/RxSwift/Observables/Implementations/SkipUntil.swift +++ b/RxSwift/Observables/Implementations/SkipUntil.swift @@ -31,7 +31,7 @@ class SkipUntilSinkOther) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { @@ -40,7 +40,7 @@ class SkipUntilSinkOther) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { switch event { case .Next: if _forwardElements { - forwardOn(event) + forwardOn(event: event) } case .Error: - forwardOn(event) + forwardOn(event: event) dispose() case .Completed: if _forwardElements { - forwardOn(event) + forwardOn(event: event) } _sourceSubscription.dispose() } } func run() -> Disposable { - let sourceSubscription = _parent._source.subscribe(self) + let sourceSubscription = _parent._source.subscribe(observer: self) let otherObserver = SkipUntilSinkOther(parent: self) - let otherSubscription = _parent._other.subscribe(otherObserver) + let otherSubscription = _parent._other.subscribe(observer: otherObserver) _sourceSubscription.disposable = sourceSubscription otherObserver._subscription.disposable = otherSubscription diff --git a/RxSwift/Observables/Implementations/SkipWhile.swift b/RxSwift/Observables/Implementations/SkipWhile.swift index d16304a0..065d6114 100644 --- a/RxSwift/Observables/Implementations/SkipWhile.swift +++ b/RxSwift/Observables/Implementations/SkipWhile.swift @@ -26,17 +26,17 @@ class SkipWhileSink : Sin do { _running = try !_parent._predicate(value) } catch let e { - forwardOn(.Error(e)) + forwardOn(event: .Error(e)) dispose() return } } if _running { - forwardOn(.Next(value)) + forwardOn(event: .Next(value)) } case .Error, .Completed: - forwardOn(event) + forwardOn(event: event) dispose() } } @@ -62,19 +62,19 @@ class SkipWhileSinkWithIndex: Producer { override func run(observer: O) -> Disposable { if let _ = _predicate { let sink = SkipWhileSink(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } else { let sink = SkipWhileSinkWithIndex(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } diff --git a/RxSwift/Observables/Implementations/SubscribeOn.swift b/RxSwift/Observables/Implementations/SubscribeOn.swift index 1f167602..4b8d50c6 100644 --- a/RxSwift/Observables/Implementations/SubscribeOn.swift +++ b/RxSwift/Observables/Implementations/SubscribeOn.swift @@ -34,7 +34,7 @@ class SubscribeOnSink : S disposeEverything.disposable = cancelSchedule cancelSchedule.disposable = parent.scheduler.schedule(()) { (_) -> Disposable in - let subscription = self.parent.source.subscribe(self) + let subscription = self.parent.source.subscribe(observer: self) disposeEverything.disposable = ScheduledDisposable(scheduler: self.parent.scheduler, disposable: subscription) return NopDisposable.instance } diff --git a/RxSwift/Observables/Implementations/Switch.swift b/RxSwift/Observables/Implementations/Switch.swift index ca31c0f1..303fcfed 100644 --- a/RxSwift/Observables/Implementations/Switch.swift +++ b/RxSwift/Observables/Implementations/Switch.swift @@ -30,7 +30,7 @@ class SwitchSink) -> Disposable { - let subscription = source.subscribe(self) + let subscription = source.subscribe(observer: self) _subscriptions.disposable = subscription return StableCompositeDisposable.create(_subscriptions, _innerSubscription) } diff --git a/RxSwift/Observables/Implementations/Take.swift b/RxSwift/Observables/Implementations/Take.swift index 10d1b300..f9ed2825 100644 --- a/RxSwift/Observables/Implementations/Take.swift +++ b/RxSwift/Observables/Implementations/Take.swift @@ -63,7 +63,7 @@ class TakeCount: Producer { override func run(observer: O) -> Disposable { let sink = TakeCountSink(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } @@ -117,7 +117,7 @@ class TakeTimeSink return NopDisposable.instance } - let disposeSubscription = _parent._source.subscribe(self) + let disposeSubscription = _parent._source.subscribe(observer: self) return BinaryDisposable(disposeTimer, disposeSubscription) } diff --git a/RxSwift/Observables/Implementations/TakeLast.swift b/RxSwift/Observables/Implementations/TakeLast.swift index c5dd8a9c..b11eba4b 100644 --- a/RxSwift/Observables/Implementations/TakeLast.swift +++ b/RxSwift/Observables/Implementations/TakeLast.swift @@ -26,18 +26,18 @@ class TakeLastSink : Sink func on(event: Event) { switch event { case .Next(let value): - _elements.enqueue(value) + _elements.enqueue(element: value) if _elements.count > self._parent._count { _elements.dequeue() } case .Error: - forwardOn(event) + forwardOn(event: event) dispose() case .Completed: for e in _elements { - forwardOn(.Next(e)) + forwardOn(event: .Next(e)) } - forwardOn(.Completed) + forwardOn(event: .Completed) dispose() } } @@ -57,7 +57,7 @@ class TakeLast: Producer { override func run(observer: O) -> Disposable { let sink = TakeLastSink(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/TakeUntil.swift b/RxSwift/Observables/Implementations/TakeUntil.swift index c806e23a..53b8b399 100644 --- a/RxSwift/Observables/Implementations/TakeUntil.swift +++ b/RxSwift/Observables/Implementations/TakeUntil.swift @@ -31,16 +31,16 @@ class TakeUntilSinkOther) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { switch event { case .Next: - _parent.forwardOn(.Completed) + _parent.forwardOn(event: .Completed) _parent.dispose() case .Error(let e): - _parent.forwardOn(.Error(e)) + _parent.forwardOn(event: .Error(e)) _parent.dispose() case .Completed: _parent._open = true @@ -76,27 +76,27 @@ class TakeUntilSink) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { switch event { case .Next: - forwardOn(event) + forwardOn(event: event) case .Error: - forwardOn(event) + forwardOn(event: event) dispose() case .Completed: - forwardOn(event) + forwardOn(event: event) dispose() } } func run() -> Disposable { let otherObserver = TakeUntilSinkOther(parent: self) - let otherSubscription = _parent._other.subscribe(otherObserver) + let otherSubscription = _parent._other.subscribe(observer: otherObserver) otherObserver._subscription.disposable = otherSubscription - let sourceSubscription = _parent._source.subscribe(self) + let sourceSubscription = _parent._source.subscribe(observer: self) return StableCompositeDisposable.create(sourceSubscription, otherObserver._subscription) } diff --git a/RxSwift/Observables/Implementations/TakeWhile.swift b/RxSwift/Observables/Implementations/TakeWhile.swift index 7db0752c..463699c6 100644 --- a/RxSwift/Observables/Implementations/TakeWhile.swift +++ b/RxSwift/Observables/Implementations/TakeWhile.swift @@ -121,11 +121,11 @@ class TakeWhile: Producer { override func run(observer: O) -> Disposable { if let _ = _predicate { let sink = TakeWhileSink(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } else { let sink = TakeWhileSinkWithIndex(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } diff --git a/RxSwift/Observables/Implementations/Throttle.swift b/RxSwift/Observables/Implementations/Throttle.swift index b0db576d..7cd4d367 100644 --- a/RxSwift/Observables/Implementations/Throttle.swift +++ b/RxSwift/Observables/Implementations/Throttle.swift @@ -33,13 +33,13 @@ class ThrottleSink } func run() -> Disposable { - let subscription = _parent._source.subscribe(self) + let subscription = _parent._source.subscribe(observer: self) return StableCompositeDisposable.create(subscription, cancellable) } func on(event: Event) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { @@ -55,17 +55,17 @@ class ThrottleSink let d = SingleAssignmentDisposable() self.cancellable.disposable = d - d.disposable = scheduler.scheduleRelative(currentId, dueTime: dueTime, action: self.propagate) + d.disposable = scheduler.scheduleRelative(state: currentId, dueTime: dueTime, action: self.propagate) case .Error: _value = nil - forwardOn(event) + forwardOn(event: event) dispose() case .Completed: if let value = _value { _value = nil - forwardOn(.Next(value)) + forwardOn(event: .Next(value)) } - forwardOn(.Completed) + forwardOn(event: .Completed) dispose() } } @@ -76,7 +76,7 @@ class ThrottleSink if let value = originalValue where _id == currentId { _value = nil - forwardOn(.Next(value)) + forwardOn(event: .Next(value)) } // } return NopDisposable.instance diff --git a/RxSwift/Observables/Implementations/Timer.swift b/RxSwift/Observables/Implementations/Timer.swift index 3645dea1..35d5eec5 100644 --- a/RxSwift/Observables/Implementations/Timer.swift +++ b/RxSwift/Observables/Implementations/Timer.swift @@ -19,8 +19,8 @@ class TimerSink : Sink { } func run() -> Disposable { - return _parent._scheduler.schedulePeriodic(0 as O.E, startAfter: _parent._dueTime, period: _parent._period!) { state in - self.forwardOn(.Next(state)) + return _parent._scheduler.schedulePeriodic(state: 0 as O.E, startAfter: _parent._dueTime, period: _parent._period!) { state in + self.forwardOn(event: .Next(state)) return state &+ 1 } } @@ -37,9 +37,9 @@ class TimerOneOffSink : Sink { } func run() -> Disposable { - return _parent._scheduler.scheduleRelative((), dueTime: _parent._dueTime) { (_) -> Disposable in - self.forwardOn(.Next(0)) - self.forwardOn(.Completed) + return _parent._scheduler.scheduleRelative(state: (), dueTime: _parent._dueTime) { (_) -> Disposable in + self.forwardOn(event: .Next(0)) + self.forwardOn(event: .Completed) return NopDisposable.instance } diff --git a/RxSwift/Observables/Implementations/ToArray.swift b/RxSwift/Observables/Implementations/ToArray.swift index bac43dbd..d843b62a 100644 --- a/RxSwift/Observables/Implementations/ToArray.swift +++ b/RxSwift/Observables/Implementations/ToArray.swift @@ -44,7 +44,7 @@ class ToArray : Producer<[SourceType]> { override func run(observer: O) -> Disposable { let sink = ToArraySink(parent: self, observer: observer) - sink.disposable = _source.subscribe(sink) + sink.disposable = _source.subscribe(observer: sink) return sink } } \ No newline at end of file diff --git a/RxSwift/Observables/Implementations/Using.swift b/RxSwift/Observables/Implementations/Using.swift index 84e7633a..ea96bedd 100644 --- a/RxSwift/Observables/Implementations/Using.swift +++ b/RxSwift/Observables/Implementations/Using.swift @@ -29,12 +29,12 @@ class UsingSink Disposable { - forwardOn(.Next(AddRef(source: _subject, refCount: _refCountDisposable).asObservable())) - createTimer(_windowId) + forwardOn(event: .Next(AddRef(source: _subject, refCount: _refCountDisposable).asObservable())) + createTimer(windowId: _windowId) - _groupDisposable.addDisposable(_parent._source.subscribeSafe(self)) + _groupDisposable.addDisposable(disposable: _parent._source.subscribeSafe(observer: self)) return _refCountDisposable } func startNewWindowAndCompleteCurrentOne() { - _subject.on(.Completed) + _subject.on(event: .Completed) _subject = PublishSubject() - forwardOn(.Next(AddRef(source: _subject, refCount: _refCountDisposable).asObservable())) + forwardOn(event: .Next(AddRef(source: _subject, refCount: _refCountDisposable).asObservable())) } func on(event: Event) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { @@ -63,12 +63,12 @@ class WindowTimeCountSink) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { @@ -49,16 +49,16 @@ class WithLatestFromSink) { - synchronizedOn(event) + synchronizedOn(event: event) } func _synchronized_on(event: Event) { @@ -95,7 +95,7 @@ class WithLatestFromSecond : ZipSink { let subscription1 = SingleAssignmentDisposable() let subscription2 = SingleAssignmentDisposable() - let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1) - let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2) + let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue(element: $0) }, this: subscription1) + let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue(element: $0) }, this: subscription2) - subscription1.disposable = _parent.source1.subscribe(observer1) - subscription2.disposable = _parent.source2.subscribe(observer2) + subscription1.disposable = _parent.source1.subscribe(observer: observer1) + subscription2.disposable = _parent.source2.subscribe(observer: observer2) return CompositeDisposable(disposables: [ subscription1, @@ -159,13 +159,13 @@ class ZipSink3_ : ZipSink { let subscription2 = SingleAssignmentDisposable() let subscription3 = SingleAssignmentDisposable() - let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1) - let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2) - let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3) + let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue(element: $0) }, this: subscription1) + let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue(element: $0) }, this: subscription2) + let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue(element: $0) }, this: subscription3) - subscription1.disposable = _parent.source1.subscribe(observer1) - subscription2.disposable = _parent.source2.subscribe(observer2) - subscription3.disposable = _parent.source3.subscribe(observer3) + subscription1.disposable = _parent.source1.subscribe(observer: observer1) + subscription2.disposable = _parent.source2.subscribe(observer: observer2) + subscription3.disposable = _parent.source3.subscribe(observer: observer3) return CompositeDisposable(disposables: [ subscription1, @@ -263,15 +263,15 @@ class ZipSink4_ : ZipSink { let subscription3 = SingleAssignmentDisposable() let subscription4 = SingleAssignmentDisposable() - let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1) - let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2) - let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3) - let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4) + let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue(element: $0) }, this: subscription1) + let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue(element: $0) }, this: subscription2) + let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue(element: $0) }, this: subscription3) + let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue(element: $0) }, this: subscription4) - subscription1.disposable = _parent.source1.subscribe(observer1) - subscription2.disposable = _parent.source2.subscribe(observer2) - subscription3.disposable = _parent.source3.subscribe(observer3) - subscription4.disposable = _parent.source4.subscribe(observer4) + subscription1.disposable = _parent.source1.subscribe(observer: observer1) + subscription2.disposable = _parent.source2.subscribe(observer: observer2) + subscription3.disposable = _parent.source3.subscribe(observer: observer3) + subscription4.disposable = _parent.source4.subscribe(observer: observer4) return CompositeDisposable(disposables: [ subscription1, @@ -375,17 +375,17 @@ class ZipSink5_ : ZipSink { let subscription4 = SingleAssignmentDisposable() let subscription5 = SingleAssignmentDisposable() - let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1) - let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2) - let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3) - let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4) - let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5) + let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue(element: $0) }, this: subscription1) + let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue(element: $0) }, this: subscription2) + let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue(element: $0) }, this: subscription3) + let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue(element: $0) }, this: subscription4) + let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue(element: $0) }, this: subscription5) - subscription1.disposable = _parent.source1.subscribe(observer1) - subscription2.disposable = _parent.source2.subscribe(observer2) - subscription3.disposable = _parent.source3.subscribe(observer3) - subscription4.disposable = _parent.source4.subscribe(observer4) - subscription5.disposable = _parent.source5.subscribe(observer5) + subscription1.disposable = _parent.source1.subscribe(observer: observer1) + subscription2.disposable = _parent.source2.subscribe(observer: observer2) + subscription3.disposable = _parent.source3.subscribe(observer: observer3) + subscription4.disposable = _parent.source4.subscribe(observer: observer4) + subscription5.disposable = _parent.source5.subscribe(observer: observer5) return CompositeDisposable(disposables: [ subscription1, @@ -495,19 +495,19 @@ class ZipSink6_ : ZipSink { let subscription5 = SingleAssignmentDisposable() let subscription6 = SingleAssignmentDisposable() - let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1) - let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2) - let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3) - let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4) - let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5) - let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6) + let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue(element: $0) }, this: subscription1) + let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue(element: $0) }, this: subscription2) + let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue(element: $0) }, this: subscription3) + let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue(element: $0) }, this: subscription4) + let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue(element: $0) }, this: subscription5) + let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue(element: $0) }, this: subscription6) - subscription1.disposable = _parent.source1.subscribe(observer1) - subscription2.disposable = _parent.source2.subscribe(observer2) - subscription3.disposable = _parent.source3.subscribe(observer3) - subscription4.disposable = _parent.source4.subscribe(observer4) - subscription5.disposable = _parent.source5.subscribe(observer5) - subscription6.disposable = _parent.source6.subscribe(observer6) + subscription1.disposable = _parent.source1.subscribe(observer: observer1) + subscription2.disposable = _parent.source2.subscribe(observer: observer2) + subscription3.disposable = _parent.source3.subscribe(observer: observer3) + subscription4.disposable = _parent.source4.subscribe(observer: observer4) + subscription5.disposable = _parent.source5.subscribe(observer: observer5) + subscription6.disposable = _parent.source6.subscribe(observer: observer6) return CompositeDisposable(disposables: [ subscription1, @@ -623,21 +623,21 @@ class ZipSink7_ : ZipSink { let subscription6 = SingleAssignmentDisposable() let subscription7 = SingleAssignmentDisposable() - let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1) - let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2) - let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3) - let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4) - let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5) - let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6) - let observer7 = ZipObserver(lock: _lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7) + let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue(element: $0) }, this: subscription1) + let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue(element: $0) }, this: subscription2) + let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue(element: $0) }, this: subscription3) + let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue(element: $0) }, this: subscription4) + let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue(element: $0) }, this: subscription5) + let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue(element: $0) }, this: subscription6) + let observer7 = ZipObserver(lock: _lock, parent: self, index: 6, setNextValue: { self._values7.enqueue(element: $0) }, this: subscription7) - subscription1.disposable = _parent.source1.subscribe(observer1) - subscription2.disposable = _parent.source2.subscribe(observer2) - subscription3.disposable = _parent.source3.subscribe(observer3) - subscription4.disposable = _parent.source4.subscribe(observer4) - subscription5.disposable = _parent.source5.subscribe(observer5) - subscription6.disposable = _parent.source6.subscribe(observer6) - subscription7.disposable = _parent.source7.subscribe(observer7) + subscription1.disposable = _parent.source1.subscribe(observer: observer1) + subscription2.disposable = _parent.source2.subscribe(observer: observer2) + subscription3.disposable = _parent.source3.subscribe(observer: observer3) + subscription4.disposable = _parent.source4.subscribe(observer: observer4) + subscription5.disposable = _parent.source5.subscribe(observer: observer5) + subscription6.disposable = _parent.source6.subscribe(observer: observer6) + subscription7.disposable = _parent.source7.subscribe(observer: observer7) return CompositeDisposable(disposables: [ subscription1, @@ -759,23 +759,23 @@ class ZipSink8_ : ZipSink { let subscription7 = SingleAssignmentDisposable() let subscription8 = SingleAssignmentDisposable() - let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue($0) }, this: subscription1) - let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue($0) }, this: subscription2) - let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue($0) }, this: subscription3) - let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue($0) }, this: subscription4) - let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue($0) }, this: subscription5) - let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue($0) }, this: subscription6) - let observer7 = ZipObserver(lock: _lock, parent: self, index: 6, setNextValue: { self._values7.enqueue($0) }, this: subscription7) - let observer8 = ZipObserver(lock: _lock, parent: self, index: 7, setNextValue: { self._values8.enqueue($0) }, this: subscription8) + let observer1 = ZipObserver(lock: _lock, parent: self, index: 0, setNextValue: { self._values1.enqueue(element: $0) }, this: subscription1) + let observer2 = ZipObserver(lock: _lock, parent: self, index: 1, setNextValue: { self._values2.enqueue(element: $0) }, this: subscription2) + let observer3 = ZipObserver(lock: _lock, parent: self, index: 2, setNextValue: { self._values3.enqueue(element: $0) }, this: subscription3) + let observer4 = ZipObserver(lock: _lock, parent: self, index: 3, setNextValue: { self._values4.enqueue(element: $0) }, this: subscription4) + let observer5 = ZipObserver(lock: _lock, parent: self, index: 4, setNextValue: { self._values5.enqueue(element: $0) }, this: subscription5) + let observer6 = ZipObserver(lock: _lock, parent: self, index: 5, setNextValue: { self._values6.enqueue(element: $0) }, this: subscription6) + let observer7 = ZipObserver(lock: _lock, parent: self, index: 6, setNextValue: { self._values7.enqueue(element: $0) }, this: subscription7) + let observer8 = ZipObserver(lock: _lock, parent: self, index: 7, setNextValue: { self._values8.enqueue(element: $0) }, this: subscription8) - subscription1.disposable = _parent.source1.subscribe(observer1) - subscription2.disposable = _parent.source2.subscribe(observer2) - subscription3.disposable = _parent.source3.subscribe(observer3) - subscription4.disposable = _parent.source4.subscribe(observer4) - subscription5.disposable = _parent.source5.subscribe(observer5) - subscription6.disposable = _parent.source6.subscribe(observer6) - subscription7.disposable = _parent.source7.subscribe(observer7) - subscription8.disposable = _parent.source8.subscribe(observer8) + subscription1.disposable = _parent.source1.subscribe(observer: observer1) + subscription2.disposable = _parent.source2.subscribe(observer: observer2) + subscription3.disposable = _parent.source3.subscribe(observer: observer3) + subscription4.disposable = _parent.source4.subscribe(observer: observer4) + subscription5.disposable = _parent.source5.subscribe(observer: observer5) + subscription6.disposable = _parent.source6.subscribe(observer: observer6) + subscription7.disposable = _parent.source7.subscribe(observer: observer7) + subscription8.disposable = _parent.source8.subscribe(observer: observer8) return CompositeDisposable(disposables: [ subscription1, diff --git a/RxSwift/Observables/Implementations/Zip+arity.tt b/RxSwift/Observables/Implementations/Zip+arity.tt index 89c31ad2..5abd3646 100644 --- a/RxSwift/Observables/Implementations/Zip+arity.tt +++ b/RxSwift/Observables/Implementations/Zip+arity.tt @@ -65,11 +65,11 @@ class ZipSink<%= i %>_<<%= (Array(1...i).map { "E\($0)" }).joinWithSeparator(", }).joinWithSeparator("\n") %> <%= (Array(1...i).map { -" let observer\($0) = ZipObserver(lock: _lock, parent: self, index: \($0 - 1), setNextValue: { self._values\($0).enqueue($0) }, this: subscription\($0))" +" let observer\($0) = ZipObserver(lock: _lock, parent: self, index: \($0 - 1), setNextValue: { self._values\($0).enqueue(element: $0) }, this: subscription\($0))" }).joinWithSeparator("\n") %> <%= (Array(1...i).map { -" subscription\($0).disposable = _parent.source\($0).subscribe(observer\($0))" }).joinWithSeparator("\n") +" subscription\($0).disposable = _parent.source\($0).subscribe(observer: observer\($0))" }).joinWithSeparator("\n") %> return CompositeDisposable(disposables: [ diff --git a/RxSwift/Observables/Observable+Binding.swift b/RxSwift/Observables/Observable+Binding.swift index 468abae0..e036b74d 100644 --- a/RxSwift/Observables/Observable+Binding.swift +++ b/RxSwift/Observables/Observable+Binding.swift @@ -69,7 +69,7 @@ extension ObservableType { */ @warn_unused_result(message: "http://git.io/rxs.uo") public func publish() -> ConnectableObservable { - return self.multicast(PublishSubject()) + return self.multicast(subject: PublishSubject()) } } @@ -90,7 +90,7 @@ extension ObservableType { @warn_unused_result(message: "http://git.io/rxs.uo") public func replay(bufferSize: Int) -> ConnectableObservable { - return self.multicast(ReplaySubject.create(bufferSize: bufferSize)) + return self.multicast(subject: ReplaySubject.create(bufferSize: bufferSize)) } /** @@ -105,7 +105,7 @@ extension ObservableType { @warn_unused_result(message: "http://git.io/rxs.uo") public func replayAll() -> ConnectableObservable { - return self.multicast(ReplaySubject.createUnbounded()) + return self.multicast(subject: ReplaySubject.createUnbounded()) } } @@ -166,7 +166,7 @@ extension ObservableType { return ShareReplay1(source: self.asObservable()) } else { - return self.replay(bufferSize).refCount() + return self.replay(bufferSize: bufferSize).refCount() } } diff --git a/RxSwift/Observables/Observable+Multiple.swift b/RxSwift/Observables/Observable+Multiple.swift index 5158a4e7..883854ac 100644 --- a/RxSwift/Observables/Observable+Multiple.swift +++ b/RxSwift/Observables/Observable+Multiple.swift @@ -203,7 +203,7 @@ extension ObservableType { @warn_unused_result(message: "http://git.io/rxs.uo") public func catchErrorJustReturn(element: E) -> Observable { - return Catch(source: asObservable(), handler: { _ in Observable.just(element) }) + return Catch(source: asObservable(), handler: { _ in Observable.just(element: element) }) } } @@ -294,7 +294,7 @@ extension Sequence where Iterator.Element : ObservableType { public func amb() -> Observable { return self.reduce(Observable.never()) { a, o in - return a.amb(o.asObservable()) + return a.amb(right: o.asObservable()) } } } diff --git a/RxSwift/Observables/Observable+Time.swift b/RxSwift/Observables/Observable+Time.swift index 6c04f190..6e31089b 100644 --- a/RxSwift/Observables/Observable+Time.swift +++ b/RxSwift/Observables/Observable+Time.swift @@ -253,7 +253,7 @@ extension ObservableType { @warn_unused_result(message: "http://git.io/rxs.uo") public func timeout(dueTime: RxTimeInterval, scheduler: SchedulerType) -> Observable { - return Timeout(source: self.asObservable(), dueTime: dueTime, other: Observable.error(RxError.Timeout), scheduler: scheduler) + return Timeout(source: self.asObservable(), dueTime: dueTime, other: Observable.error(error: RxError.Timeout), scheduler: scheduler) } /** diff --git a/RxSwift/Observers/ObserverBase.swift b/RxSwift/Observers/ObserverBase.swift index 07959521..13c86438 100644 --- a/RxSwift/Observers/ObserverBase.swift +++ b/RxSwift/Observers/ObserverBase.swift @@ -17,7 +17,7 @@ class ObserverBase : Disposable, ObserverType { switch event { case .Next: if _isStopped == 0 { - onCore(event) + onCore(event: event) } case .Error, .Completed: @@ -25,7 +25,7 @@ class ObserverBase : Disposable, ObserverType { return } - onCore(event) + onCore(event: event) } } diff --git a/RxSwift/Observers/TailRecursiveSink.swift b/RxSwift/Observers/TailRecursiveSink.swift index 9f30892b..7a2ac6ec 100644 --- a/RxSwift/Observers/TailRecursiveSink.swift +++ b/RxSwift/Observers/TailRecursiveSink.swift @@ -39,12 +39,12 @@ class TailRecursiveSink Disposable { _generators.append(sources) - schedule(.MoveNext) + schedule(command: .MoveNext) return _subscription } - func invoke(command: TailRecursiveSinkCommand) { + func invoke(value command: TailRecursiveSinkCommand) { switch command { case .Dispose: disposeCommand() @@ -55,11 +55,11 @@ class TailRecursiveSink) -> Disposable { @@ -146,7 +146,7 @@ class TailRecursiveSink(state: StateType, dueTime: NSTimeInterval, action: (StateType) -> Disposable) -> Disposable { - return _mainScheduler.scheduleRelative(state, dueTime: dueTime, action: action) + return _mainScheduler.scheduleRelative(state: state, dueTime: dueTime, action: action) } /** @@ -85,6 +85,6 @@ public final class ConcurrentMainScheduler : SchedulerType { - returns: The disposable object used to cancel the scheduled action (best effort). */ public func schedulePeriodic(state: StateType, startAfter: TimeInterval, period: TimeInterval, action: (StateType) -> StateType) -> Disposable { - return _mainScheduler.schedulePeriodic(state, startAfter: startAfter, period: period, action: action) + return _mainScheduler.schedulePeriodic(state: state, startAfter: startAfter, period: period, action: action) } } \ No newline at end of file diff --git a/RxSwift/Schedulers/CurrentThreadScheduler.swift b/RxSwift/Schedulers/CurrentThreadScheduler.swift index 0ab9d0f7..fef801f8 100644 --- a/RxSwift/Schedulers/CurrentThreadScheduler.swift +++ b/RxSwift/Schedulers/CurrentThreadScheduler.swift @@ -22,7 +22,7 @@ import Foundation let CurrentThreadSchedulerValueInstance = CurrentThreadSchedulerKeyInstance @objc class CurrentThreadSchedulerKey : NSObject, NSCopying { - override func isEqual(object: AnyObject?) -> Bool { + override func isEqual(_ object: AnyObject?) -> Bool { return object === CurrentThreadSchedulerKeyInstance } @@ -38,7 +38,7 @@ import Foundation } @objc class CurrentThreadSchedulerQueueKey : NSObject, NSCopying { - override func isEqual(object: AnyObject?) -> Bool { + override func isEqual(_ object: AnyObject?) -> Bool { return object === CurrentThreadSchedulerQueueKeyInstance } @@ -71,10 +71,10 @@ public class CurrentThreadScheduler : ImmediateSchedulerType { static var queue : ScheduleQueue? { get { - return NSThread.getThreadLocalStorageValueForKey(CurrentThreadSchedulerQueueKeyInstance) + return NSThread.getThreadLocalStorageValueForKey(key: CurrentThreadSchedulerQueueKeyInstance) } set { - NSThread.setThreadLocalStorageValue(newValue, forKey: CurrentThreadSchedulerQueueKeyInstance) + NSThread.setThreadLocalStorageValue(value: newValue, forKey: CurrentThreadSchedulerQueueKeyInstance) } } @@ -83,11 +83,11 @@ public class CurrentThreadScheduler : ImmediateSchedulerType { */ public static private(set) var isScheduleRequired: Bool { get { - let value: CurrentThreadSchedulerValue? = NSThread.getThreadLocalStorageValueForKey(CurrentThreadSchedulerKeyInstance) + let value: CurrentThreadSchedulerValue? = NSThread.getThreadLocalStorageValueForKey(key: CurrentThreadSchedulerKeyInstance) return value == nil } set(isScheduleRequired) { - NSThread.setThreadLocalStorageValue(isScheduleRequired ? nil : CurrentThreadSchedulerValueInstance, forKey: CurrentThreadSchedulerKeyInstance) + NSThread.setThreadLocalStorageValue(value: isScheduleRequired ? nil : CurrentThreadSchedulerValueInstance, forKey: CurrentThreadSchedulerKeyInstance) } } @@ -138,7 +138,7 @@ public class CurrentThreadScheduler : ImmediateSchedulerType { } let scheduledItem = ScheduledItem(action: action, state: state) - queue.value.enqueue(scheduledItem) + queue.value.enqueue(element: scheduledItem) // In Xcode 7.3, `return scheduledItem` causes segmentation fault 11 on release build. // To workaround this compiler issue, returns AnonymousDisposable that disposes scheduledItem. diff --git a/RxSwift/Schedulers/ImmediateScheduler.swift b/RxSwift/Schedulers/ImmediateScheduler.swift index fc54fd51..ee7a83fb 100644 --- a/RxSwift/Schedulers/ImmediateScheduler.swift +++ b/RxSwift/Schedulers/ImmediateScheduler.swift @@ -27,7 +27,7 @@ private class ImmediateScheduler : ImmediateSchedulerType { */ func schedule(state: StateType, action: (StateType) -> Disposable) -> Disposable { let disposable = SingleAssignmentDisposable() - _asyncLock.invoke(AnonymousInvocable { + _asyncLock.invoke(action: AnonymousInvocable { if disposable.disposed { return } diff --git a/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift b/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift index 1a4e3aa4..510c431a 100644 --- a/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift +++ b/RxSwift/Schedulers/Internal/InvocableScheduledItem.swift @@ -19,6 +19,6 @@ struct InvocableScheduledItem : InvocableType { } func invoke() { - _invocable.invoke(_state) + _invocable.invoke(value: _state) } } \ No newline at end of file diff --git a/RxSwift/Schedulers/SchedulerServices+Emulation.swift b/RxSwift/Schedulers/SchedulerServices+Emulation.swift index 3906d7a7..feab8382 100644 --- a/RxSwift/Schedulers/SchedulerServices+Emulation.swift +++ b/RxSwift/Schedulers/SchedulerServices+Emulation.swift @@ -34,7 +34,7 @@ class SchedulePeriodicRecursive { } func start() -> Disposable { - return _scheduler.scheduleRecursive(SchedulePeriodicRecursiveCommand.Tick, dueTime: _startAfter, action: self.tick) + return _scheduler.scheduleRecursive(state: SchedulePeriodicRecursiveCommand.Tick, dueTime: _startAfter, action: self.tick) } func tick(command: SchedulePeriodicRecursiveCommand, scheduler: RecursiveScheduler) -> Void { @@ -43,12 +43,12 @@ class SchedulePeriodicRecursive { // tick interval is short. switch command { case .Tick: - scheduler.schedule(.Tick, dueTime: _period) + scheduler.schedule(state: .Tick, dueTime: _period) // The idea is that if on tick there wasn't any item enqueued, schedule to perform work immediatelly. // Else work will be scheduled after previous enqueued work completes. if AtomicIncrement(&_pendingTickCount) == 1 { - self.tick(.DispatchStart, scheduler: scheduler) + self.tick(command: .DispatchStart, scheduler: scheduler) } case .DispatchStart: @@ -56,7 +56,7 @@ class SchedulePeriodicRecursive { // Start work and schedule check is this last batch of work if AtomicDecrement(&_pendingTickCount) > 0 { // This gives priority to scheduler emulation, it's not perfect, but helps - scheduler.schedule(SchedulePeriodicRecursiveCommand.DispatchStart) + scheduler.schedule(state: SchedulePeriodicRecursiveCommand.DispatchStart) } } } diff --git a/RxSwift/Schedulers/VirtualTimeScheduler.swift b/RxSwift/Schedulers/VirtualTimeScheduler.swift index 602f546d..f0b4452e 100644 --- a/RxSwift/Schedulers/VirtualTimeScheduler.swift +++ b/RxSwift/Schedulers/VirtualTimeScheduler.swift @@ -31,7 +31,7 @@ public class VirtualTimeScheduler - returns: Current time. */ public var now: RxTime { - return _converter.convertFromVirtualTime(clock) + return _converter.convertFromVirtualTime(virtualTime: clock) } /** @@ -51,7 +51,7 @@ public class VirtualTimeScheduler _running = false _converter = converter _schedulerQueue = PriorityQueue(hasHigherPriority: { - switch converter.compareVirtualTime($0.time, $1.time) { + switch converter.compareVirtualTime(lhs: $0.time, $1.time) { case .LessThan: return true case .Equal: @@ -73,7 +73,7 @@ public class VirtualTimeScheduler - returns: The disposable object used to cancel the scheduled action (best effort). */ public func schedule(state: StateType, action: StateType -> Disposable) -> Disposable { - return self.scheduleRelative(state, dueTime: 0.0) { a in + return self.scheduleRelative(state: state, dueTime: 0.0) { a in return action(a) } } @@ -88,8 +88,8 @@ public class VirtualTimeScheduler */ public func scheduleRelative(state: StateType, dueTime: RxTimeInterval, action: StateType -> Disposable) -> Disposable { let time = self.now.addingTimeInterval(dueTime) - let absoluteTime = _converter.convertToVirtualTime(time) - let adjustedTime = self.adjustScheduledTime(absoluteTime) + let absoluteTime = _converter.convertToVirtualTime(time: time) + let adjustedTime = self.adjustScheduledTime(time: absoluteTime) return scheduleAbsoluteVirtual(state, time: adjustedTime, action: action) } @@ -103,7 +103,7 @@ public class VirtualTimeScheduler */ public func scheduleRelativeVirtual(state: StateType, dueTime: VirtualTimeInterval, action: StateType -> Disposable) -> Disposable { let time = _converter.offsetVirtualTime(time: self.clock, offset: dueTime) - return scheduleAbsoluteVirtual(state, time: time, action: action) + return scheduleAbsoluteVirtual(state: state, time: time, action: action) } /** @@ -126,9 +126,9 @@ public class VirtualTimeScheduler _nextId += 1 - _schedulerQueue.enqueue(item) + _schedulerQueue.enqueue(element: item) - compositeDisposable.addDisposable(item) + compositeDisposable.addDisposable(disposable: item) return compositeDisposable } @@ -156,12 +156,12 @@ public class VirtualTimeScheduler break } - if _converter.compareVirtualTime(next.time, self.clock).greaterThan { + if _converter.compareVirtualTime(lhs: next.time, self.clock).greaterThan { _clock = next.time } next.invoke() - _schedulerQueue.remove(next) + _schedulerQueue.remove(element: next) } while _running _running = false @@ -170,7 +170,7 @@ public class VirtualTimeScheduler func findNext() -> VirtualSchedulerItem? { while let front = _schedulerQueue.peek() { if front.disposed { - _schedulerQueue.remove(front) + _schedulerQueue.remove(element: front) continue } @@ -198,16 +198,16 @@ public class VirtualTimeScheduler break } - if _converter.compareVirtualTime(next.time, virtualTime).greaterThan { + if _converter.compareVirtualTime(lhs: next.time, virtualTime).greaterThan { break } - if _converter.compareVirtualTime(next.time, self.clock).greaterThan { + if _converter.compareVirtualTime(lhs: next.time, self.clock).greaterThan { _clock = next.time } next.invoke() - _schedulerQueue.remove(next) + _schedulerQueue.remove(element: next) } while _running _clock = virtualTime @@ -221,7 +221,7 @@ public class VirtualTimeScheduler MainScheduler.ensureExecutingOnScheduler() let sleepTo = _converter.offsetVirtualTime(time: clock, offset: virtualInterval) - if _converter.compareVirtualTime(sleepTo, clock).lessThen { + if _converter.compareVirtualTime(lhs: sleepTo, clock).lessThen { fatalError("Can't sleep to past.") } diff --git a/RxSwift/Subjects/PublishSubject.swift b/RxSwift/Subjects/PublishSubject.swift index 797be522..aa59446f 100644 --- a/RxSwift/Subjects/PublishSubject.swift +++ b/RxSwift/Subjects/PublishSubject.swift @@ -52,7 +52,7 @@ final public class PublishSubject */ public func on(event: Event) { _lock.lock(); defer { _lock.unlock() } - _synchronized_on(event) + _synchronized_on(event: event) } func _synchronized_on(event: Event) { @@ -62,12 +62,12 @@ final public class PublishSubject return } - _observers.on(event) + _observers.on(event: event) case .Completed, .Error: if _stoppedEvent == nil { _stoppedEvent = event _stopped = true - _observers.on(event) + _observers.on(event: event) _observers.removeAll() } } @@ -81,31 +81,31 @@ final public class PublishSubject */ public override func subscribe(observer: O) -> Disposable { _lock.lock(); defer { _lock.unlock() } - return _synchronized_subscribe(observer) + return _synchronized_subscribe(observer: observer) } func _synchronized_subscribe(observer: O) -> Disposable { if let stoppedEvent = _stoppedEvent { - observer.on(stoppedEvent) + observer.on(event: stoppedEvent) return NopDisposable.instance } if _disposed { - observer.on(.Error(RxError.Disposed(object: self))) + observer.on(event: .Error(RxError.Disposed(object: self))) return NopDisposable.instance } - let key = _observers.insert(observer.asObserver()) + let key = _observers.insert(element: observer.asObserver()) return SubscriptionDisposable(owner: self, key: key) } func synchronizedUnsubscribe(disposeKey: DisposeKey) { _lock.lock(); defer { _lock.unlock() } - _synchronized_unsubscribe(disposeKey) + _synchronized_unsubscribe(disposeKey: disposeKey) } func _synchronized_unsubscribe(disposeKey: DisposeKey) { - _ = _observers.removeKey(disposeKey) + _ = _observers.removeKey(key: disposeKey) } /** diff --git a/RxSwift/Subjects/ReplaySubject.swift b/RxSwift/Subjects/ReplaySubject.swift index 0e883a36..66bf469b 100644 --- a/RxSwift/Subjects/ReplaySubject.swift +++ b/RxSwift/Subjects/ReplaySubject.swift @@ -98,7 +98,7 @@ class ReplayBufferBase override func on(event: Event) { _lock.lock(); defer { _lock.unlock() } - _synchronized_on(event) + _synchronized_on(event: event) } func _synchronized_on(event: Event) { @@ -112,44 +112,44 @@ class ReplayBufferBase switch event { case .Next(let value): - addValueToBuffer(value) + addValueToBuffer(value: value) trim() - _observers.on(event) + _observers.on(event: event) case .Error, .Completed: _stoppedEvent = event trim() - _observers.on(event) + _observers.on(event: event) _observers.removeAll() } } override func subscribe(observer: O) -> Disposable { _lock.lock(); defer { _lock.unlock() } - return _synchronized_subscribe(observer) + return _synchronized_subscribe(observer: observer) } func _synchronized_subscribe(observer: O) -> Disposable { if _disposed { - observer.on(.Error(RxError.Disposed(object: self))) + observer.on(event: .Error(RxError.Disposed(object: self))) return NopDisposable.instance } let AnyObserver = observer.asObserver() - replayBuffer(AnyObserver) + replayBuffer(observer: AnyObserver) if let stoppedEvent = _stoppedEvent { - observer.on(stoppedEvent) + observer.on(event: stoppedEvent) return NopDisposable.instance } else { - let key = _observers.insert(AnyObserver) + let key = _observers.insert(element: AnyObserver) return SubscriptionDisposable(owner: self, key: key) } } func synchronizedUnsubscribe(disposeKey: DisposeKey) { _lock.lock(); defer { _lock.unlock() } - _synchronized_unsubscribe(disposeKey) + _synchronized_unsubscribe(disposeKey: disposeKey) } func _synchronized_unsubscribe(disposeKey: DisposeKey) { @@ -157,7 +157,7 @@ class ReplayBufferBase return } - _ = _observers.removeKey(disposeKey) + _ = _observers.removeKey(key: disposeKey) } override func dispose() { @@ -195,7 +195,7 @@ final class ReplayOne : ReplayBufferBase { override func replayBuffer(observer: AnyObserver) { if let value = _value { - observer.on(.Next(value)) + observer.on(event: .Next(value)) } } @@ -213,12 +213,12 @@ class ReplayManyBase : ReplayBufferBase { } override func addValueToBuffer(value: Element) { - _queue.enqueue(value) + _queue.enqueue(element: value) } override func replayBuffer(observer: AnyObserver) { for item in _queue { - observer.on(.Next(item)) + observer.on(event: .Next(item)) } }