Skip to content

Commit f655ffa

Browse files
Fix OptInRule conformance and re-register rules
- Use @SwiftSyntaxRule(explicitRewriter: true, optIn: true) instead of directly conforming to OptInRule, which caused a type mismatch - Rebase on latest upstream main - Re-run rules and reporters register
1 parent 8ed2d15 commit f655ffa

6 files changed

Lines changed: 27 additions & 16 deletions

File tree

Source/SwiftLintBuiltInRules/Rules/Idiomatic/RedundantFinalActorRule.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import SwiftSyntax
22

3-
@SwiftSyntaxRule(explicitRewriter: true)
4-
struct RedundantFinalActorRule: OptInRule {
3+
@SwiftSyntaxRule(explicitRewriter: true, optIn: true)
4+
struct RedundantFinalActorRule: Rule {
55
var configuration = SeverityConfiguration<Self>(.warning)
66

77
static let description = RuleDescription(

Tests/GeneratedTests/GeneratedTests_07.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ final class RedundantDiscardableLetRuleGeneratedTests: SwiftLintTestCase {
151151
}
152152
}
153153

154-
final class RedundantNilCoalescingRuleGeneratedTests: SwiftLintTestCase {
154+
final class RedundantFinalActorRuleGeneratedTests: SwiftLintTestCase {
155155
func testWithDefaultConfiguration() {
156-
verifyRule(RedundantNilCoalescingRule.description)
156+
verifyRule(RedundantFinalActorRule.description)
157157
}
158158
}

Tests/GeneratedTests/GeneratedTests_08.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
@testable import SwiftLintCore
88
import TestHelpers
99

10+
final class RedundantNilCoalescingRuleGeneratedTests: SwiftLintTestCase {
11+
func testWithDefaultConfiguration() {
12+
verifyRule(RedundantNilCoalescingRule.description)
13+
}
14+
}
15+
1016
final class RedundantObjcAttributeRuleGeneratedTests: SwiftLintTestCase {
1117
func testWithDefaultConfiguration() {
1218
verifyRule(RedundantObjcAttributeRule.description)
@@ -150,9 +156,3 @@ final class StrictFilePrivateRuleGeneratedTests: SwiftLintTestCase {
150156
verifyRule(StrictFilePrivateRule.description)
151157
}
152158
}
153-
154-
final class StrongIBOutletRuleGeneratedTests: SwiftLintTestCase {
155-
func testWithDefaultConfiguration() {
156-
verifyRule(StrongIBOutletRule.description)
157-
}
158-
}

Tests/GeneratedTests/GeneratedTests_09.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
@testable import SwiftLintCore
88
import TestHelpers
99

10+
final class StrongIBOutletRuleGeneratedTests: SwiftLintTestCase {
11+
func testWithDefaultConfiguration() {
12+
verifyRule(StrongIBOutletRule.description)
13+
}
14+
}
15+
1016
final class SuperfluousElseRuleGeneratedTests: SwiftLintTestCase {
1117
func testWithDefaultConfiguration() {
1218
verifyRule(SuperfluousElseRule.description)
@@ -150,9 +156,3 @@ final class UnneededSynthesizedInitializerRuleGeneratedTests: SwiftLintTestCase
150156
verifyRule(UnneededSynthesizedInitializerRule.description)
151157
}
152158
}
153-
154-
final class UnneededThrowsRuleGeneratedTests: SwiftLintTestCase {
155-
func testWithDefaultConfiguration() {
156-
verifyRule(UnneededThrowsRule.description)
157-
}
158-
}

Tests/GeneratedTests/GeneratedTests_10.swift

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,12 @@
77
@testable import SwiftLintCore
88
import TestHelpers
99

10+
final class UnneededThrowsRuleGeneratedTests: SwiftLintTestCase {
11+
func testWithDefaultConfiguration() {
12+
verifyRule(UnneededThrowsRule.description)
13+
}
14+
}
15+
1016
final class UnownedVariableCaptureRuleGeneratedTests: SwiftLintTestCase {
1117
func testWithDefaultConfiguration() {
1218
verifyRule(UnownedVariableCaptureRule.description)

Tests/IntegrationTests/Resources/default_rule_configurations.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,6 +1006,11 @@ redundant_discardable_let:
10061006
meta:
10071007
opt-in: false
10081008
correctable: true
1009+
redundant_final_actor:
1010+
severity: warning
1011+
meta:
1012+
opt-in: true
1013+
correctable: true
10091014
redundant_nil_coalescing:
10101015
severity: warning
10111016
meta:

0 commit comments

Comments
 (0)