Skip to content

Commit

Permalink
Use default Equatable and Hashable implementations
Browse files Browse the repository at this point in the history
  • Loading branch information
marcelofabri committed Nov 19, 2018
1 parent 5901d30 commit cf0c7b7
Show file tree
Hide file tree
Showing 48 changed files with 6 additions and 319 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,5 @@ public extension Configuration {
default: return nil
}
}

// MARK: Equatable

public static func == (lhs: IndentationStyle, rhs: IndentationStyle) -> Bool {
switch (lhs, rhs) {
case (.tabs, .tabs): return true
case let (.spaces(lhs), .spaces(rhs)): return lhs == rhs
case (_, _): return false
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,11 @@ private let regexCacheLock = NSLock()
private struct RegexCacheKey: Hashable {
let pattern: String
let options: NSRegularExpression.Options
}

var hashValue: Int {
return pattern.hashValue ^ options.rawValue.hashValue
}

static func == (lhs: RegexCacheKey, rhs: RegexCacheKey) -> Bool {
return lhs.options == rhs.options && lhs.pattern == rhs.pattern
extension NSRegularExpression.Options: Hashable {
public var hashValue: Int {
return rawValue.hashValue
}
}

Expand Down
10 changes: 0 additions & 10 deletions Source/SwiftLintFramework/Models/Command.swift
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,4 @@ public struct Command: Equatable {
]
}
}

// MARK: Equatable

public static func == (lhs: Command, rhs: Command) -> Bool {
return lhs.action == rhs.action &&
lhs.ruleIdentifiers == rhs.ruleIdentifiers &&
lhs.line == rhs.line &&
lhs.character == rhs.character &&
lhs.modifier == rhs.modifier
}
}
7 changes: 0 additions & 7 deletions Source/SwiftLintFramework/Models/Correction.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,4 @@ public struct Correction: Equatable {
public var consoleDescription: String {
return "\(location) Corrected \(ruleDescription.name)"
}

// MARK: Equatable

public static func == (lhs: Correction, rhs: Correction) -> Bool {
return lhs.ruleDescription == rhs.ruleDescription &&
lhs.location == rhs.location
}
}
8 changes: 0 additions & 8 deletions Source/SwiftLintFramework/Models/Location.swift
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,6 @@ public struct Location: CustomStringConvertible, Comparable {
}
}

// MARK: Comparable

public static func == (lhs: Location, rhs: Location) -> Bool {
return lhs.file == rhs.file &&
lhs.line == rhs.line &&
lhs.character == rhs.character
}

public static func < (lhs: Location, rhs: Location) -> Bool {
if lhs.file != rhs.file {
return lhs.file < rhs.file
Expand Down
8 changes: 0 additions & 8 deletions Source/SwiftLintFramework/Models/Region.swift
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,4 @@ public struct Region: Equatable {
let identifiers = type(of: rule).description.deprecatedAliases
return Set(disabledRuleIdentifiers.map { $0.stringRepresentation }).intersection(identifiers)
}

// MARK: Equatable

public static func == (lhs: Region, rhs: Region) -> Bool {
return lhs.start == rhs.start &&
lhs.end == rhs.end &&
lhs.disabledRuleIdentifiers == rhs.disabledRuleIdentifiers
}
}
8 changes: 0 additions & 8 deletions Source/SwiftLintFramework/Models/RuleIdentifier.swift
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@ public enum RuleIdentifier: Hashable, ExpressibleByStringLiteral {

private static let allStringRepresentation = "all"

public var hashValue: Int {
return stringRepresentation.hashValue
}

public var stringRepresentation: String {
switch self {
case .all:
Expand All @@ -25,8 +21,4 @@ public enum RuleIdentifier: Hashable, ExpressibleByStringLiteral {
public init(stringLiteral value: String) {
self = RuleIdentifier(value)
}

public static func == (lhs: RuleIdentifier, rhs: RuleIdentifier) -> Bool {
return lhs.stringRepresentation == rhs.stringRepresentation
}
}
6 changes: 0 additions & 6 deletions Source/SwiftLintFramework/Models/RuleParameter.swift
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,4 @@ public struct RuleParameter<T: Equatable>: Equatable {
self.severity = severity
self.value = value
}

// MARK: - Equatable

public static func == <T>(lhs: RuleParameter<T>, rhs: RuleParameter<T>) -> Bool {
return lhs.value == rhs.value && lhs.severity == rhs.severity
}
}
9 changes: 0 additions & 9 deletions Source/SwiftLintFramework/Models/StyleViolation.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,4 @@ public struct StyleViolation: CustomStringConvertible, Equatable {
self.location = location
self.reason = reason ?? ruleDescription.description
}

// MARK: Equatable

public static func == (lhs: StyleViolation, rhs: StyleViolation) -> Bool {
return lhs.ruleDescription == rhs.ruleDescription &&
lhs.location == rhs.location &&
lhs.severity == rhs.severity &&
lhs.reason == rhs.reason
}
}
7 changes: 0 additions & 7 deletions Source/SwiftLintFramework/Models/YamlParser.swift
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,6 @@ import Yams

internal enum YamlParserError: Error, Equatable {
case yamlParsing(String)

static func == (lhs: YamlParserError, rhs: YamlParserError) -> Bool {
switch (lhs, rhs) {
case let (.yamlParsing(lhs), .yamlParsing(rhs)):
return lhs == rhs
}
}
}

// MARK: - YamlParser
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,4 @@ public struct AttributesConfiguration: RuleConfiguration, Equatable {
try severityConfiguration.apply(configuration: severityString)
}
}

public static func == (lhs: AttributesConfiguration,
rhs: AttributesConfiguration) -> Bool {
return lhs.severityConfiguration == rhs.severityConfiguration &&
lhs.alwaysOnSameLine == rhs.alwaysOnSameLine &&
lhs.alwaysOnNewLine == rhs.alwaysOnNewLine
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,4 @@ public struct CollectionAlignmentConfiguration: RuleConfiguration, Equatable {
try severityConfiguration.apply(configuration: severityString)
}
}

public static func == (lhs: CollectionAlignmentConfiguration,
rhs: CollectionAlignmentConfiguration) -> Bool {
return lhs.alignColons == rhs.alignColons &&
lhs.severityConfiguration == rhs.severityConfiguration
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,4 @@ public struct ColonConfiguration: RuleConfiguration, Equatable {
try severityConfiguration.apply(configuration: severityString)
}
}

public static func == (lhs: ColonConfiguration,
rhs: ColonConfiguration) -> Bool {
return lhs.severityConfiguration == rhs.severityConfiguration &&
lhs.flexibleRightSpacing == rhs.flexibleRightSpacing &&
lhs.applyToDictionaries == rhs.applyToDictionaries
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
public struct ConditionalReturnsOnNewlineConfiguration: RuleConfiguration {
public struct ConditionalReturnsOnNewlineConfiguration: RuleConfiguration, Equatable {
private(set) var severityConfiguration = SeverityConfiguration(.warning)
private(set) var ifOnly = false

Expand All @@ -18,11 +18,3 @@ public struct ConditionalReturnsOnNewlineConfiguration: RuleConfiguration {
}
}
}

extension ConditionalReturnsOnNewlineConfiguration: Equatable {
public static func == (lhs: ConditionalReturnsOnNewlineConfiguration,
rhs: ConditionalReturnsOnNewlineConfiguration) -> Bool {
return lhs.severityConfiguration == rhs.severityConfiguration &&
lhs.ifOnly == rhs.ifOnly
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,4 @@ public struct CyclomaticComplexityConfiguration: RuleConfiguration, Equatable {
throw ConfigurationError.unknownConfiguration
}
}

public static func == (lhs: CyclomaticComplexityConfiguration, rhs: CyclomaticComplexityConfiguration) -> Bool {
return lhs.length == rhs.length &&
lhs.ignoresCaseStatements == rhs.ignoresCaseStatements
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,4 @@ public struct DiscouragedDirectInitConfiguration: RuleConfiguration, Equatable {
discouragedInits = Set(types + types.map(toExplicitInitMethod))
}
}

// MARK: - Equatable

public static func == (lhs: DiscouragedDirectInitConfiguration, rhs: DiscouragedDirectInitConfiguration) -> Bool {
return lhs.discouragedInits == rhs.discouragedInits && lhs.severityConfiguration == rhs.severityConfiguration
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,4 @@ public struct ExplicitTypeInterfaceConfiguration: RuleConfiguration, Equatable {
}
}
}

public static func == (lhs: ExplicitTypeInterfaceConfiguration, rhs: ExplicitTypeInterfaceConfiguration) -> Bool {
return lhs.allowedKinds == rhs.allowedKinds && lhs.severityConfiguration == rhs.severityConfiguration
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,4 @@ public struct FileHeaderConfiguration: RuleConfiguration, Equatable {

return requiredPattern.flatMap { regexFromPattern(for: file, using: $0) }
}

public static func == (lhs: FileHeaderConfiguration,
rhs: FileHeaderConfiguration) -> Bool {
return lhs.severityConfiguration == rhs.severityConfiguration
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,4 @@ public struct FileLengthRuleConfiguration: RuleConfiguration, Equatable {
}

}

public static func == (lhs: FileLengthRuleConfiguration,
rhs: FileLengthRuleConfiguration) -> Bool {
return lhs.ignoreCommentOnlyLines == rhs.ignoreCommentOnlyLines &&
lhs.severityConfiguration == rhs.severityConfiguration
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,4 @@ public struct FileNameConfiguration: RuleConfiguration, Equatable {
self.suffixPattern = suffixPattern
}
}

public static func == (lhs: FileNameConfiguration, rhs: FileNameConfiguration) -> Bool {
return lhs.severity == rhs.severity &&
lhs.excluded == rhs.excluded &&
lhs.prefixPattern == rhs.prefixPattern &&
lhs.suffixPattern == rhs.suffixPattern
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,4 @@ public struct FunctionParameterCountConfiguration: RuleConfiguration, Equatable
throw ConfigurationError.unknownConfiguration
}
}

public static func == (lhs: FunctionParameterCountConfiguration,
rhs: FunctionParameterCountConfiguration) -> Bool {
return lhs.severityConfiguration == rhs.severityConfiguration &&
lhs.ignoresDefaultParameters == rhs.ignoresDefaultParameters
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,4 @@ public struct ImplicitlyUnwrappedOptionalConfiguration: RuleConfiguration, Equat
try severity.apply(configuration: severityString)
}
}

public static func == (lhs: ImplicitlyUnwrappedOptionalConfiguration,
rhs: ImplicitlyUnwrappedOptionalConfiguration) -> Bool {
return lhs.severity == rhs.severity &&
lhs.mode == rhs.mode
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,4 @@ public struct LineLengthConfiguration: RuleConfiguration, Equatable {
}
}
}

public static func == (lhs: LineLengthConfiguration, rhs: LineLengthConfiguration) -> Bool {
return lhs.length == rhs.length &&
lhs.ignoresURLs == rhs.ignoresURLs &&
lhs.ignoresComments == rhs.ignoresComments &&
lhs.ignoresFunctionDeclarations == rhs.ignoresFunctionDeclarations &&
lhs.ignoresInterpolatedStrings == rhs.ignoresInterpolatedStrings
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,4 @@ public struct MissingDocsRuleConfiguration: RuleConfiguration, Equatable {
}
self.parameters = parameters
}

public static func == (lhs: MissingDocsRuleConfiguration, rhs: MissingDocsRuleConfiguration) -> Bool {
return lhs.parameters == rhs.parameters
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,4 @@ public struct ModifierOrderConfiguration: RuleConfiguration, Equatable {
try severityConfiguration.apply(configuration: severityString)
}
}

public static func == (lhs: ModifierOrderConfiguration,
rhs: ModifierOrderConfiguration) -> Bool {
return lhs.preferredModifierOrder == rhs.preferredModifierOrder &&
lhs.severityConfiguration == rhs.severityConfiguration
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,10 +56,4 @@ public struct MultilineArgumentsConfiguration: RuleConfiguration, Equatable {
}
}
}

public static func == (lhs: MultilineArgumentsConfiguration,
rhs: MultilineArgumentsConfiguration) -> Bool {
return lhs.severityConfiguration == rhs.severityConfiguration &&
lhs.firstArgumentLocation == rhs.firstArgumentLocation
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,6 @@ public struct NameConfiguration: RuleConfiguration, Equatable {
"\"validates_start_with_lowercase\" and will be removed in a future release.")
}
}

public static func == (lhs: NameConfiguration, rhs: NameConfiguration) -> Bool {
return lhs.minLength == rhs.minLength &&
lhs.maxLength == rhs.maxLength &&
zip(lhs.excluded, rhs.excluded).reduce(true) { $0 && ($1.0 == $1.1) } &&
zip(lhs.allowedSymbolsSet, rhs.allowedSymbolsSet).reduce(true) { $0 && ($1.0 == $1.1) } &&
lhs.validatesStartWithLowercase == rhs.validatesStartWithLowercase
}
}

// MARK: - ConfigurationProviderRule extensions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,4 @@ public struct NestingConfiguration: RuleConfiguration, Equatable {
case .warning: return config.warning
}
}

public static func == (lhs: NestingConfiguration, rhs: NestingConfiguration) -> Bool {
return lhs.typeLevel == rhs.typeLevel
&& lhs.statementLevel == rhs.statementLevel
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,4 @@ public struct NumberSeparatorConfiguration: RuleConfiguration, Equatable {
try severityConfiguration.apply(configuration: severityString)
}
}

public static func == (lhs: NumberSeparatorConfiguration,
rhs: NumberSeparatorConfiguration) -> Bool {
return lhs.minimumLength == rhs.minimumLength &&
lhs.minimumFractionLength == rhs.minimumFractionLength &&
lhs.severityConfiguration == rhs.severityConfiguration
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,4 @@ public struct ObjectLiteralConfiguration: RuleConfiguration, Equatable {
try severityConfiguration.apply(configuration: severityString)
}
}

public static func == (lhs: ObjectLiteralConfiguration,
rhs: ObjectLiteralConfiguration) -> Bool {
return lhs.severityConfiguration == rhs.severityConfiguration &&
lhs.imageLiteral == rhs.imageLiteral &&
lhs.colorLiteral == rhs.colorLiteral
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,4 @@ public struct OverridenSuperCallConfiguration: RuleConfiguration, Equatable {
names = names.filter { !excluded.contains($0) }
return names
}

public static func == (lhs: OverridenSuperCallConfiguration,
rhs: OverridenSuperCallConfiguration) -> Bool {
return lhs.excluded == rhs.excluded &&
lhs.included == rhs.included &&
lhs.severityConfiguration == rhs.severityConfiguration
}
}
Loading

0 comments on commit cf0c7b7

Please sign in to comment.