From 6e994776dfbbfa46432d48606cddec64d2b19cce Mon Sep 17 00:00:00 2001 From: JP Simard Date: Tue, 3 Jan 2017 23:17:28 -0800 Subject: [PATCH] use guard instead of nested if let --- .../Models/MasterRuleList.swift | 27 +++++++++---------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/Source/SwiftLintFramework/Models/MasterRuleList.swift b/Source/SwiftLintFramework/Models/MasterRuleList.swift index f10e74e7a..72aac5af4 100644 --- a/Source/SwiftLintFramework/Models/MasterRuleList.swift +++ b/Source/SwiftLintFramework/Models/MasterRuleList.swift @@ -35,21 +35,18 @@ public struct RuleList { var rules = [String: Rule]() for (key, configuration) in dictionary { - if let identifier = identifier(for: key), let ruleType = list[identifier] { - - guard rules[identifier] == nil else { - throw RuleListError.duplicatedConfigurations(rule: ruleType) - } - - do { - let configuredRule = try ruleType.init(configuration: configuration) - rules[identifier] = configuredRule - } catch { - queuedPrintError( - "Invalid configuration for '\(identifier)'. Falling back to default." - ) - rules[identifier] = ruleType.init() - } + guard let identifier = identifier(for: key), let ruleType = list[identifier] else { + continue + } + guard rules[identifier] == nil else { + throw RuleListError.duplicatedConfigurations(rule: ruleType) + } + do { + let configuredRule = try ruleType.init(configuration: configuration) + rules[identifier] = configuredRule + } catch { + queuedPrintError("Invalid configuration for '\(identifier)'. Falling back to default.") + rules[identifier] = ruleType.init() } }