Skip to content

Clean up merge warnings #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2025
Merged

Clean up merge warnings #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Source/SwiftLintBuiltInRules/Rules/Idiomatic/ReduceIntoInsteadOfLoopRule.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ internal extension ReduceIntoInsteadOfLoopRule {
]

static let collectionNames: [String: CollectionType] =
ReduceIntoInsteadOfLoopRule.collectionTypes.reduce(into: [String: CollectionType]()) { partialResult, type in
ReduceIntoInsteadOfLoopRule.collectionTypes.reduce(into: [:]) { partialResult, type in
partialResult[type.name] = type
}
}
Expand All @@ -73,7 +73,7 @@ private extension CodeBlockItemListSyntax {
typealias IndexRange = Range<Self.Index>
typealias IndexRangeForStmts = (range: IndexRange, forStmt: ForStmtSyntax)
// Collect all ForInStmts and track their index ranges
let indexRangeForStatements: [IndexRangeForStmts] = self.reduce(into: [IndexRangeForStmts]()) { partialResult, codeBlockItem in
let indexRangeForStatements: [IndexRangeForStmts] = self.reduce(into: []) { partialResult, codeBlockItem in
guard let codeBlockItemIndex = self.index(of: codeBlockItem) else {
return
}
Expand Down
6 changes: 3 additions & 3 deletions Source/SwiftLintBuiltInRules/Rules/Idiomatic/ReduceIntoInsteadOfLoopRuleExamples.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
struct ReduceIntoInsteadOfLoopRuleExamples {
static let nonTriggeringExamples: [Example] = [
Example("""
let encountered: Array<SomeType> = someSequence.reduce(into: Array<SomeType>(), { result, eachN in
let result: [SomeType] = someSequence.reduce(into: [], { result, eachN in
result.insert(eachN)
})
"""),
Example("""
let encountered: Set<SomeType> = someSequence.reduce(into: Set<SomeType>(), { result, eachN in
let result: Set<SomeType> = someSequence.reduce(into: []], { result, eachN in
result.insert(eachN)
})
"""),
Example("""
let encountered: Dictionary<SomeType1, SomeType2> = someSequence.reduce(into: Dictionary<SomeType1, SomeType2>(), { result, eachN in
let result: [SomeType1: SomeType2] = someSequence.reduce(into: [:], { result, eachN in
result[SomeType1Value] = SomeType2Value
})
"""),
Expand Down
2 changes: 1 addition & 1 deletion Source/SwiftLintBuiltInRules/Rules/Idiomatic/ReduceIntoInsteadOfLoopRuleModels.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import SwiftSyntax

typealias ReduceIntoInsteadOfLoopModels = ReduceIntoInsteadOfLoopRule
struct ReduceIntoInsteadOfLoopRuleModels {}

internal extension ReduceIntoInsteadOfLoopRule {
struct ReferencedVariable: Hashable {
Expand Down
Loading