diff options
| author | Bug Magnet <marco.nikic@mullvad.net> | 2023-08-30 13:28:58 +0200 |
|---|---|---|
| committer | Bug Magnet <marco.nikic@mullvad.net> | 2023-08-30 13:28:58 +0200 |
| commit | 9dce2b7142ff6db0b07441c302e2f81552bcb8a8 (patch) | |
| tree | e00e2c549c2c9afef0741d6dd6ea8725d28bf35e /ios/MullvadLogging | |
| parent | 9ac934e6886d20d7f7a72bf85bbde9d1b5901976 (diff) | |
| parent | 0323fe99d2afa2f93a5d888b8a6387d0e2e54ef6 (diff) | |
| download | mullvadvpn-9dce2b7142ff6db0b07441c302e2f81552bcb8a8.tar.xz mullvadvpn-9dce2b7142ff6db0b07441c302e2f81552bcb8a8.zip | |
Merge branch 'LINT-ALL-THE-THINGS'
Diffstat (limited to 'ios/MullvadLogging')
| -rw-r--r-- | ios/MullvadLogging/CustomFormatLogHandler.swift | 2 | ||||
| -rw-r--r-- | ios/MullvadLogging/OSLogHandler.swift | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ios/MullvadLogging/CustomFormatLogHandler.swift b/ios/MullvadLogging/CustomFormatLogHandler.swift index 3ed4fe24cb..fefb8260ce 100644 --- a/ios/MullvadLogging/CustomFormatLogHandler.swift +++ b/ios/MullvadLogging/CustomFormatLogHandler.swift @@ -48,7 +48,7 @@ public struct CustomFormatLogHandler: LogHandler { line: UInt ) { let mergedMetadata = self.metadata - .merging(metadata ?? [:]) { lhs, rhs -> Logger.MetadataValue in + .merging(metadata ?? [:]) { _, rhs -> Logger.MetadataValue in rhs } let prettyMetadata = Self.formatMetadata(mergedMetadata) diff --git a/ios/MullvadLogging/OSLogHandler.swift b/ios/MullvadLogging/OSLogHandler.swift index 25501108ee..82791519d2 100644 --- a/ios/MullvadLogging/OSLogHandler.swift +++ b/ios/MullvadLogging/OSLogHandler.swift @@ -63,7 +63,7 @@ public struct OSLogHandler: LogHandler { line: UInt ) { let mergedMetadata = self.metadata - .merging(metadata ?? [:]) { lhs, rhs -> Logging.Logger.MetadataValue in + .merging(metadata ?? [:]) { _, rhs -> Logging.Logger.MetadataValue in rhs } let prettyMetadata = Self.formatMetadata(mergedMetadata) |