From d16c7f8ab95147862a554045463666ce9faed65e Mon Sep 17 00:00:00 2001 From: Stephen Celis Date: Tue, 8 Nov 2022 09:16:48 -0800 Subject: [PATCH] Support ordered dictionaries from URL Routing 0.4.0 (#20) --- Package.resolved | 4 ++-- Package.swift | 2 +- Sources/VaporRouting/URLRequestData+Vapor.Request.swift | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.resolved b/Package.resolved index 4bd37a8b74..beb259ff48 100644 --- a/Package.resolved +++ b/Package.resolved @@ -195,8 +195,8 @@ "repositoryURL": "https://github.com/pointfreeco/swift-url-routing", "state": { "branch": null, - "revision": "80e8a0257ccdd639e31f709954ceca6b690fdc67", - "version": "0.3.1" + "revision": "f54c4f74e7884f7930560c08387817ce28271770", + "version": "0.4.0" } }, { diff --git a/Package.swift b/Package.swift index 37b6f7fe63..0522b6b383 100644 --- a/Package.swift +++ b/Package.swift @@ -15,7 +15,7 @@ let package = Package( ], dependencies: [ .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0"), - .package(url: "https://github.com/pointfreeco/swift-url-routing", from: "0.1.0"), + .package(url: "https://github.com/pointfreeco/swift-url-routing", from: "0.4.0"), ], targets: [ .target( diff --git a/Sources/VaporRouting/URLRequestData+Vapor.Request.swift b/Sources/VaporRouting/URLRequestData+Vapor.Request.swift index 1d473de445..66609cf8d5 100644 --- a/Sources/VaporRouting/URLRequestData+Vapor.Request.swift +++ b/Sources/VaporRouting/URLRequestData+Vapor.Request.swift @@ -36,7 +36,7 @@ extension URLRequestData { query: components.queryItems?.reduce(into: [:]) { query, item in query[item.name, default: []].append(item.value) } ?? [:], - headers: Dictionary( + headers: .init( request.headers.map { key, value in ( key,