From ab03600b0ddd25cb6aea4b2806a1e19895020e84 Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 15 Sep 2020 11:33:05 +0300 Subject: [PATCH 1/4] Add disposable_nil rule --- xcode/.swiftlint.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index 8e71145..cbda066 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -251,6 +251,12 @@ custom_rules: message: "The parameter name is actually used in the function name. Use _ instead." severity: error + disposable_nil: + name: "Disposable nil" + regex: ' *\S*(d|D)isposable *= *nil' + message: "Use `dispose()` instead of nil." + severity: error + # Rx unused_map_parameter: From 697805638cbd188565b7a54ab373a884baa94b05 Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 15 Sep 2020 11:51:29 +0300 Subject: [PATCH 2/4] Code correction --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index cbda066..2f1053a 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -253,7 +253,7 @@ custom_rules: disposable_nil: name: "Disposable nil" - regex: ' *\S*(d|D)isposable *= *nil' + regex: ' *\S*(d|D)isposable\?? *= *nil' message: "Use `dispose()` instead of nil." severity: error From c9ced95bce60c8658051896ab118bbf53ca14fe1 Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 15 Sep 2020 12:05:24 +0300 Subject: [PATCH 3/4] Code correction --- xcode/.swiftlint.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index 2f1053a..7ba943a 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -251,12 +251,6 @@ custom_rules: message: "The parameter name is actually used in the function name. Use _ instead." severity: error - disposable_nil: - name: "Disposable nil" - regex: ' *\S*(d|D)isposable\?? *= *nil' - message: "Use `dispose()` instead of nil." - severity: error - # Rx unused_map_parameter: @@ -265,6 +259,12 @@ custom_rules: message: "Replace Rx.map operator with replace(with:) or asVoid(). For Sequence.map consider using forEach." severity: warning + disposable_nil: + name: "Disposable nil" + regex: ' *\S*(d|D)isposable\?? *= *nil' + message: "Use `dispose()` instead of nil." + severity: error + # LeadKit multiple_add_subview: From 7b92842a4beccfe7bd9487e2683b0d39ee357b89 Mon Sep 17 00:00:00 2001 From: Vlad Date: Tue, 15 Sep 2020 12:14:59 +0300 Subject: [PATCH 4/4] Update message --- xcode/.swiftlint.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xcode/.swiftlint.yml b/xcode/.swiftlint.yml index 7ba943a..40a41b4 100644 --- a/xcode/.swiftlint.yml +++ b/xcode/.swiftlint.yml @@ -262,7 +262,7 @@ custom_rules: disposable_nil: name: "Disposable nil" regex: ' *\S*(d|D)isposable\?? *= *nil' - message: "Use `dispose()` instead of nil." + message: "nil assigning doesn't dispose subscription. Call `dispose()` instead." severity: error # LeadKit