From ed68f24c46301ebba4bf9a8e2719a60f82c52681 Mon Sep 17 00:00:00 2001 From: Mads Odgaard Date: Thu, 26 Feb 2026 09:26:05 +0100 Subject: [PATCH 1/2] remove localized compares --- Sources/OpenAPIRuntime/Interface/CurrencyTypes.swift | 2 +- .../OpenAPIRuntime/URICoder/Serialization/URISerializer.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Sources/OpenAPIRuntime/Interface/CurrencyTypes.swift b/Sources/OpenAPIRuntime/Interface/CurrencyTypes.swift index d64a418f..30bdf2ac 100644 --- a/Sources/OpenAPIRuntime/Interface/CurrencyTypes.swift +++ b/Sources/OpenAPIRuntime/Interface/CurrencyTypes.swift @@ -71,7 +71,7 @@ extension ServerRequestMetadata: CustomStringConvertible { extension HTTPFields: PrettyStringConvertible { var prettyDescription: String { - sorted(by: { $0.name.canonicalName.localizedCompare($1.name.canonicalName) == .orderedAscending }) + sorted(by: { $0.name.canonicalName < $1.name.canonicalName }) .map { "\($0.name.canonicalName): \($0.value)" }.joined(separator: "; ") } } diff --git a/Sources/OpenAPIRuntime/URICoder/Serialization/URISerializer.swift b/Sources/OpenAPIRuntime/URICoder/Serialization/URISerializer.swift index 838ca9b1..1793efa5 100644 --- a/Sources/OpenAPIRuntime/URICoder/Serialization/URISerializer.swift +++ b/Sources/OpenAPIRuntime/URICoder/Serialization/URISerializer.swift @@ -250,7 +250,7 @@ extension URISerializer { ) throws { guard !dictionary.isEmpty else { return } let sortedDictionary = dictionary.sorted { a, b in - a.key.localizedCaseInsensitiveCompare(b.key) == .orderedAscending + a.key.lowercased() < b.key.lowercased() } let keyAndValueSeparator: String From 9af77a2a74410f6d9ebb02591fd1ea13e8c41c19 Mon Sep 17 00:00:00 2001 From: Mads Odgaard Date: Thu, 26 Feb 2026 09:46:54 +0100 Subject: [PATCH 2/2] format --- Sources/OpenAPIRuntime/Interface/CurrencyTypes.swift | 4 ++-- .../OpenAPIRuntime/URICoder/Serialization/URISerializer.swift | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Sources/OpenAPIRuntime/Interface/CurrencyTypes.swift b/Sources/OpenAPIRuntime/Interface/CurrencyTypes.swift index 30bdf2ac..0d8dfb31 100644 --- a/Sources/OpenAPIRuntime/Interface/CurrencyTypes.swift +++ b/Sources/OpenAPIRuntime/Interface/CurrencyTypes.swift @@ -71,8 +71,8 @@ extension ServerRequestMetadata: CustomStringConvertible { extension HTTPFields: PrettyStringConvertible { var prettyDescription: String { - sorted(by: { $0.name.canonicalName < $1.name.canonicalName }) - .map { "\($0.name.canonicalName): \($0.value)" }.joined(separator: "; ") + sorted(by: { $0.name.canonicalName < $1.name.canonicalName }).map { "\($0.name.canonicalName): \($0.value)" } + .joined(separator: "; ") } } diff --git a/Sources/OpenAPIRuntime/URICoder/Serialization/URISerializer.swift b/Sources/OpenAPIRuntime/URICoder/Serialization/URISerializer.swift index 1793efa5..aa606381 100644 --- a/Sources/OpenAPIRuntime/URICoder/Serialization/URISerializer.swift +++ b/Sources/OpenAPIRuntime/URICoder/Serialization/URISerializer.swift @@ -249,9 +249,7 @@ extension URISerializer { forKey key: String ) throws { guard !dictionary.isEmpty else { return } - let sortedDictionary = dictionary.sorted { a, b in - a.key.lowercased() < b.key.lowercased() - } + let sortedDictionary = dictionary.sorted { a, b in a.key.lowercased() < b.key.lowercased() } let keyAndValueSeparator: String let pairSeparator: String