global: fix remaining swiftlint violations

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/.swiftlint.yml b/.swiftlint.yml
index c9ee5036cba71622b0a90faf79770e2b0542f712..a63b4df0c9e5f0497fb8893971bb2d3c8cffcb73 100644 (file)
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -7,6 +7,7 @@ disabled_rules:
  - type_body_length
  - function_body_length
  - nesting
+ - inclusive_language
 opt_in_rules:
  - empty_count
  - empty_string

diff --git a/Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift
index 5fa255d4667083e090d80038bf3d3ab7e05e92f7..2abce6f23fad2700b2117bb50586bfc057d36ab3 100644 (file)
--- a/Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift
+++ b/Sources/WireGuardApp/UI/iOS/ViewController/TunnelEditTableViewController.swift
@@ -266,7 +266,7 @@ extension TunnelEditTableViewController {
                 guard let self = self else { return }
                 let isAllowedIPsChanged = self.tunnelViewModel.updateDNSServersInAllowedIPsIfRequired(oldDNSServers: oldValue, newDNSServers: newValue)
                 if isAllowedIPsChanged {
-                    let section = self.sections.firstIndex { if case .peer(_) = $0 { return true } else { return false } }
+                    let section = self.sections.firstIndex { if case .peer = $0 { return true } else { return false } }
                     if let section = section, let row = self.peerFields.firstIndex(of: .allowedIPs) {
                         self.tableView.reloadRows(at: [IndexPath(row: row, section: section)], with: .none)
                     }

diff --git a/Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift b/Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift
index 96637cd5448d53571fffa668c1b1fb9b006a1318..3757cf28deb47210de621b68ab0800a11cae8a24 100644 (file)
--- a/Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift
+++ b/Sources/WireGuardApp/UI/macOS/ViewController/TunnelDetailTableViewController.swift
@@ -246,7 +246,7 @@ class TunnelDetailTableViewController: NSViewController {
             var modifiedRowIndices = IndexSet()
             for (index, field) in fields.enumerated() {
                 guard let change = changes[field] else { continue }
-                if case .modified(_) = change {
+                if case .modified = change {
                     let row = modelRowsInSection[0 ..< index].filter { $0.isVisible }.count
                     modifiedRowIndices.insert(rowOffset + row)
                 }

diff --git a/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift b/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift
index 1e21490c66d55712d25894b9fadb9ca7f826cbf2..9efe1fa054300423ceaad45285b64554dd6ae456 100644 (file)
--- a/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift
+++ b/Sources/WireGuardKit/PacketTunnelSettingsGenerator.swift
@@ -31,7 +31,7 @@ class PacketTunnelSettingsGenerator {
 
             switch result {
             case .success(.some(let endpoint)):
-                if case .name(_, _) = endpoint.host { assert(false, "Endpoint is not resolved") }
+                if case .name = endpoint.host { assert(false, "Endpoint is not resolved") }
                 wgSettings.append("endpoint=\(endpoint.stringRepresentation)\n")
             case .success(.none):
                 break
@@ -58,7 +58,7 @@ class PacketTunnelSettingsGenerator {
                 wgSettings.append("preshared_key=\(preSharedKey)\n")
             }
             if let endpoint = try? resolvedEndpoints[index]?.withReresolvedIP() {
-                if case .name(_, _) = endpoint.host { assert(false, "Endpoint is not resolved") }
+                if case .name = endpoint.host { assert(false, "Endpoint is not resolved") }
                 wgSettings.append("endpoint=\(endpoint.stringRepresentation)\n")
             }
             let persistentKeepAlive = peer.persistentKeepAlive ?? 0