Unwrap dictionary before merging additional headers

jonnyholland · jonnyholland · commit 627a8d82d5a8 · 2024-10-22T21:40:27.000-04:00
diff --git a/Sources/ComposableArchitecturePattern/Server.swift b/Sources/ComposableArchitecturePattern/Server.swift
@@ -404,8 +404,11 @@ public extension Server {
 		guard let additionalHeaders else {
 			return self.additionalHTTPHeaders
 		}
+		guard var additionalHTTPHeaders else {
+			return additionalHeaders
+		}
 		
-		return self.additionalHTTPHeaders?.merging(additionalHeaders, uniquingKeysWith: { $1 })
+		return additionalHTTPHeaders.merging(additionalHeaders, uniquingKeysWith: { $1 })
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -404,8 +404,11 @@ public extension Server {`
`404`	`404`	`guard let additionalHeaders else {`
`405`	`405`	`return self.additionalHTTPHeaders`
`406`	`406`	`}`
	`407`	`+ guard var additionalHTTPHeaders else {`
	`408`	`+ return additionalHeaders`
	`409`	`+ }`
`407`	`410`
`408`		`- return self.additionalHTTPHeaders?.merging(additionalHeaders, uniquingKeysWith: { $1 })`
	`411`	`+ return additionalHTTPHeaders.merging(additionalHeaders, uniquingKeysWith: { $1 })`
`409`	`412`	`}`
`410`	`413`	`}`
`411`	`414`