From b9413349344f661059028a1c234a3237b847e8fd Mon Sep 17 00:00:00 2001 From: Kenta Kubo <601636+kkebo@users.noreply.github.com> Date: Fri, 5 Sep 2025 03:18:41 +0900 Subject: [PATCH] refactor: refactor with switch expressions --- ...DemandRuleAction+CustomStringConvertible.swift | 15 +++++---------- ...NEOnDemandRuleInterfaceType+CaseIterable.swift | 4 ++-- ...uleInterfaceType+CustomStringConvertible.swift | 15 +++++---------- 3 files changed, 12 insertions(+), 22 deletions(-) diff --git a/DNSecure/Extensions/NEOnDemandRuleAction+CustomStringConvertible.swift b/DNSecure/Extensions/NEOnDemandRuleAction+CustomStringConvertible.swift index 4c0f3f0..1eb9bb6 100644 --- a/DNSecure/Extensions/NEOnDemandRuleAction+CustomStringConvertible.swift +++ b/DNSecure/Extensions/NEOnDemandRuleAction+CustomStringConvertible.swift @@ -10,16 +10,11 @@ import NetworkExtension extension NEOnDemandRuleAction: @retroactive CustomStringConvertible { public var description: String { switch self { - case .connect: - return "Apply settings" - case .disconnect: - return "Do not apply settings" - case .evaluateConnection: - return "Apply with excluded domains" - case .ignore: - return "As is" - default: - return "Unknown" + case .connect: "Apply settings" + case .disconnect: "Do not apply settings" + case .evaluateConnection: "Apply with excluded domains" + case .ignore: "As is" + @unknown case _: "Unknown" } } } diff --git a/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CaseIterable.swift b/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CaseIterable.swift index f03d39f..b3979ba 100644 --- a/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CaseIterable.swift +++ b/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CaseIterable.swift @@ -10,9 +10,9 @@ import NetworkExtension extension NEOnDemandRuleInterfaceType: @retroactive CaseIterable { public static var allCases: [Self] { #if os(macOS) - return [.any, .ethernet, .wiFi] + [.any, .ethernet, .wiFi] #else - return [.any, .wiFi, .cellular] + [.any, .wiFi, .cellular] #endif } } diff --git a/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CustomStringConvertible.swift b/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CustomStringConvertible.swift index e720a8b..461ab83 100644 --- a/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CustomStringConvertible.swift +++ b/DNSecure/Extensions/NEOnDemandRuleInterfaceType+CustomStringConvertible.swift @@ -10,20 +10,15 @@ import NetworkExtension extension NEOnDemandRuleInterfaceType: @retroactive CustomStringConvertible { public var description: String { switch self { - case .any: - return "Any" + case .any: "Any" #if os(macOS) - case .ethernet: - return "Ethernet" + case .ethernet: "Ethernet" #endif - case .wiFi: - return "Wi-Fi" + case .wiFi: "Wi-Fi" #if os(iOS) - case .cellular: - return "Cellular" + case .cellular: "Cellular" #endif - default: - return "Unknown" + @unknown case _: "Unknown" } } }