From b059010f5524c0f2f48356cd223d8ae5a7e742db Mon Sep 17 00:00:00 2001 From: Tae Won Ha Date: Fri, 18 Jun 2021 08:54:53 +0200 Subject: [PATCH] Adapt to RxSwift 6.2 --- .../Sources/NvimView/NvimView+MenuItems.swift | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/NvimView/Sources/NvimView/NvimView+MenuItems.swift b/NvimView/Sources/NvimView/NvimView+MenuItems.swift index cc4c4bd6..16089b1e 100644 --- a/NvimView/Sources/NvimView/NvimView+MenuItems.swift +++ b/NvimView/Sources/NvimView/NvimView+MenuItems.swift @@ -43,14 +43,14 @@ extension NvimView { case .insert, .replace: self.api .input(keys: "ui", errWhenBlocked: false) - .subscribe(onError: { [weak self] error in + .subscribe(onFailure: { [weak self] error in self?.eventsSubject.onNext(.apiError(msg: "Could not undo", cause: error)) }) .disposed(by: self.disposeBag) case .normal, .visual: self.api .input(keys: "u", errWhenBlocked: false) - .subscribe(onError: { [weak self] error in + .subscribe(onFailure: { [weak self] error in self?.eventsSubject.onNext(.apiError(msg: "Could not undo", cause: error)) }) .disposed(by: self.disposeBag) @@ -64,14 +64,14 @@ extension NvimView { case .insert, .replace: self.api .input(keys: "i", errWhenBlocked: false) - .subscribe(onError: { [weak self] error in + .subscribe(onFailure: { [weak self] error in self?.eventsSubject.onNext(.apiError(msg: "Could not redo", cause: error)) }) .disposed(by: self.disposeBag) case .normal, .visual: self.api .input(keys: "", errWhenBlocked: false) - .subscribe(onError: { [weak self] error in + .subscribe(onFailure: { [weak self] error in self?.eventsSubject.onNext(.apiError(msg: "Could not redo", cause: error)) }) .disposed(by: self.disposeBag) @@ -85,7 +85,7 @@ extension NvimView { case .visual, .normal: self.api .input(keys: "\"+d", errWhenBlocked: false) - .subscribe(onError: { [weak self] error in + .subscribe(onFailure: { [weak self] error in self?.eventsSubject.onNext(.apiError(msg: "Could not cut", cause: error)) }) .disposed(by: self.disposeBag) @@ -99,7 +99,7 @@ extension NvimView { case .visual, .normal: self.api .input(keys: "\"+y", errWhenBlocked: false) - .subscribe(onError: { [weak self] error in + .subscribe(onFailure: { [weak self] error in self?.eventsSubject.onNext(.apiError(msg: "Could not copy", cause: error)) }) .disposed(by: self.disposeBag) @@ -114,7 +114,7 @@ extension NvimView { // phase == 1 means paste in a single call self.api .paste(data: content, crlf: false, phase: -1) - .subscribe(onError: { [weak self] error in + .subscribe(onFailure: { [weak self] error in self?.eventsSubject.onNext(.apiError(msg: "Could not paste \(content)", cause: error)) }) .disposed(by: self.disposeBag) @@ -125,7 +125,7 @@ extension NvimView { case .normal, .visual: self.api .input(keys: "x", errWhenBlocked: false) - .subscribe(onError: { [weak self] error in + .subscribe(onFailure: { [weak self] error in self?.eventsSubject.onNext(.apiError(msg: "Could not delete", cause: error)) }) .disposed(by: self.disposeBag) @@ -139,14 +139,14 @@ extension NvimView { case .insert, .visual: self.api .input(keys: "ggVG", errWhenBlocked: false) - .subscribe(onError: { [weak self] error in + .subscribe(onFailure: { [weak self] error in self?.eventsSubject.onNext(.apiError(msg: "Could not select all", cause: error)) }) .disposed(by: self.disposeBag) default: self.api .input(keys: "ggVG", errWhenBlocked: false) - .subscribe(onError: { [weak self] error in + .subscribe(onFailure: { [weak self] error in self?.eventsSubject.onNext(.apiError(msg: "Could not select all", cause: error)) }) .disposed(by: self.disposeBag)