Skip to content

Commit 74d7001

Browse files
mattpolzinmattpolzin
authored
Merge pull request #353 from mattpolzin/modern-if-let
2 parents 7b59773 + 5c9fd86 commit 74d7001

22 files changed

+26
-26
lines changed

‎Sources/OpenAPIKit/Example.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ extension OpenAPI.Example: LocallyDereferenceable {
195195
dereferencedFromComponentNamed name: String?
196196
) throws -> OpenAPI.Example{
197197
var vendorExtensions = self.vendorExtensions
198-
if let name = name {
198+
if let name {
199199
vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
200200
}
201201

‎Sources/OpenAPIKit/Header/DereferencedHeader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public struct DereferencedHeader: Equatable {
5757
}
5858

5959
var header = header
60-
if let name = name {
60+
if let name {
6161
header.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
6262
}
6363

‎Sources/OpenAPIKit/Link.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,7 @@ extension OpenAPI.Link: LocallyDereferenceable {
274274
dereferencedFromComponentNamed name: String?
275275
) throws -> OpenAPI.Link {
276276
var vendorExtensions = self.vendorExtensions
277-
if let name = name {
277+
if let name {
278278
vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
279279
}
280280

‎Sources/OpenAPIKit/Parameter/DereferencedParameter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public struct DereferencedParameter: Equatable {
5959
}
6060

6161
var parameter = parameter
62-
if let name = name {
62+
if let name {
6363
parameter.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
6464
}
6565

‎Sources/OpenAPIKit/Path Item/DereferencedPathItem.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public struct DereferencedPathItem: Equatable {
6565
self.trace = try pathItem.trace.map { try DereferencedOperation($0, resolvingIn: components, following: references) }
6666

6767
var pathItem = pathItem
68-
if let name = name {
68+
if let name {
6969
pathItem.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
7070
}
7171

‎Sources/OpenAPIKit/Request/DereferencedRequest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public struct DereferencedRequest: Equatable {
3838
}
3939

4040
var request = request
41-
if let name = name {
41+
if let name {
4242
request.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
4343
}
4444

‎Sources/OpenAPIKit/Response/DereferencedResponse.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public struct DereferencedResponse: Equatable {
5151
}
5252

5353
var response = response
54-
if let name = name {
54+
if let name {
5555
response.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
5656
}
5757

‎Sources/OpenAPIKit/Schema Object/DereferencedJSONSchema.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -457,7 +457,7 @@ extension JSONSchema: LocallyDereferenceable {
457457
) throws -> DereferencedJSONSchema {
458458
func addComponentNameExtension<T>(to context: CoreContext<T>) -> CoreContext<T> {
459459
var extensions = context.vendorExtensions
460-
if let name = name {
460+
if let name {
461461
extensions[OpenAPI.Components.componentNameExtension] = .init(name)
462462
}
463463
return context.with(vendorExtensions: extensions)
@@ -479,7 +479,7 @@ extension JSONSchema: LocallyDereferenceable {
479479
// TODO: consider which other core context properties to override here as with description ^
480480

481481
var extensions = dereferenced.vendorExtensions
482-
if let name = name {
482+
if let name {
483483
extensions[OpenAPI.Components.componentNameExtension] = .init(name)
484484
}
485485
dereferenced = dereferenced.with(vendorExtensions: vendorExtensions)

‎Sources/OpenAPIKit/Schema Object/JSONSchema+Combining.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ extension JSONSchema.CoreContext {
608608
extension JSONSchema.IntegerContext {
609609
internal func validatedContext() throws -> JSONSchema.IntegerContext {
610610
let validatedMinimum: Bound?
611-
if let minimum = minimum {
611+
if let minimum {
612612
guard minimum.value >= 0 else {
613613
throw JSONSchemaResolutionError(.inconsistency("Integer minimum (\(minimum.value) cannot be below 0"))
614614
}
@@ -633,7 +633,7 @@ extension JSONSchema.IntegerContext {
633633
extension JSONSchema.NumericContext {
634634
internal func validatedContext() throws -> JSONSchema.NumericContext {
635635
let validatedMinimum: Bound?
636-
if let minimum = minimum {
636+
if let minimum {
637637
guard minimum.value >= 0 else {
638638
throw JSONSchemaResolutionError(.inconsistency("Number minimum (\(minimum.value) cannot be below 0"))
639639
}

‎Sources/OpenAPIKit/Schema Object/JSONSchema.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1897,7 +1897,7 @@ extension JSONSchema: Decodable {
18971897
// TODO: support multiple types instead of just grabbing the first one (see TODO immediately above as well)
18981898
let typeHint = typeHints.first
18991899

1900-
if let typeHint = typeHint {
1900+
if let typeHint {
19011901
let keysFromElsewhere = keysFrom.filter({ $0 != typeHint.group })
19021902
if !keysFromElsewhere.isEmpty {
19031903
_warnings.append(

‎Sources/OpenAPIKit/Security/SecurityScheme.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ extension OpenAPI.SecurityScheme: LocallyDereferenceable {
267267
dereferencedFromComponentNamed name: String?
268268
) throws -> OpenAPI.SecurityScheme {
269269
var ret = self
270-
if let name = name {
270+
if let name {
271271
ret.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
272272
}
273273
return ret

‎Sources/OpenAPIKit30/Example.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ extension OpenAPI.Example: LocallyDereferenceable {
171171
dereferencedFromComponentNamed name: String?
172172
) throws -> OpenAPI.Example{
173173
var vendorExtensions = self.vendorExtensions
174-
if let name = name {
174+
if let name {
175175
vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
176176
}
177177

‎Sources/OpenAPIKit30/Header/DereferencedHeader.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public struct DereferencedHeader: Equatable {
5757
}
5858

5959
var header = header
60-
if let name = name {
60+
if let name {
6161
header.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
6262
}
6363

‎Sources/OpenAPIKit30/Link.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ extension OpenAPI.Link: LocallyDereferenceable {
263263
dereferencedFromComponentNamed name: String?
264264
) throws -> OpenAPI.Link {
265265
var vendorExtensions = self.vendorExtensions
266-
if let name = name {
266+
if let name {
267267
vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
268268
}
269269

‎Sources/OpenAPIKit30/Parameter/DereferencedParameter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public struct DereferencedParameter: Equatable {
5959
}
6060

6161
var parameter = parameter
62-
if let name = name {
62+
if let name {
6363
parameter.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
6464
}
6565

‎Sources/OpenAPIKit30/Path Item/DereferencedPathItem.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public struct DereferencedPathItem: Equatable {
6565
self.trace = try pathItem.trace.map { try DereferencedOperation($0, resolvingIn: components, following: references) }
6666

6767
var pathItem = pathItem
68-
if let name = name {
68+
if let name {
6969
pathItem.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
7070
}
7171

‎Sources/OpenAPIKit30/Request/DereferencedRequest.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public struct DereferencedRequest: Equatable {
3838
}
3939

4040
var request = request
41-
if let name = name {
41+
if let name {
4242
request.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
4343
}
4444

‎Sources/OpenAPIKit30/Response/DereferencedResponse.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public struct DereferencedResponse: Equatable {
5151
}
5252

5353
var response = response
54-
if let name = name {
54+
if let name {
5555
response.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
5656
}
5757

‎Sources/OpenAPIKit30/Schema Object/JSONSchema+Combining.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ extension JSONSchema.CoreContext {
578578
extension JSONSchema.IntegerContext {
579579
internal func validatedContext() throws -> JSONSchema.IntegerContext {
580580
let validatedMinimum: Bound?
581-
if let minimum = minimum {
581+
if let minimum {
582582
guard minimum.value >= 0 else {
583583
throw JSONSchemaResolutionError(.inconsistency("Integer minimum (\(minimum.value) cannot be below 0"))
584584
}
@@ -603,7 +603,7 @@ extension JSONSchema.IntegerContext {
603603
extension JSONSchema.NumericContext {
604604
internal func validatedContext() throws -> JSONSchema.NumericContext {
605605
let validatedMinimum: Bound?
606-
if let minimum = minimum {
606+
if let minimum {
607607
guard minimum.value >= 0 else {
608608
throw JSONSchemaResolutionError(.inconsistency("Number minimum (\(minimum.value) cannot be below 0"))
609609
}

‎Sources/OpenAPIKit30/Schema Object/JSONSchema.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1831,7 +1831,7 @@ extension JSONSchema: Decodable {
18311831
)
18321832
}
18331833

1834-
if let typeHint = typeHint {
1834+
if let typeHint {
18351835
let keysFromElsewhere = keysFrom.filter({ $0 != typeHint.group })
18361836
if !keysFromElsewhere.isEmpty {
18371837
_warnings.append(

‎Sources/OpenAPIKit30/Security/SecurityScheme.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ extension OpenAPI.SecurityScheme: LocallyDereferenceable {
244244
dereferencedFromComponentNamed name: String?
245245
) throws -> OpenAPI.SecurityScheme {
246246
var ret = self
247-
if let name = name {
247+
if let name {
248248
ret.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name)
249249
}
250250
return ret

‎Sources/OpenAPIKitCompat/Compat30To31.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ extension OpenAPIKit30.OpenAPI.Parameter.SchemaContext: To31 {
172172
let newExamples = examples?.mapValues(eitherRefTo31)
173173
switch schema {
174174
case .a(let ref):
175-
if let newExamples = newExamples {
175+
if let newExamples {
176176
return OpenAPIKit.OpenAPI.Parameter.SchemaContext(
177177
schemaReference: .init(ref.to31()),
178178
style: style,
@@ -190,7 +190,7 @@ extension OpenAPIKit30.OpenAPI.Parameter.SchemaContext: To31 {
190190
)
191191
}
192192
case .b(let schema):
193-
if let newExamples = newExamples {
193+
if let newExamples {
194194
return OpenAPIKit.OpenAPI.Parameter.SchemaContext(
195195
schema.to31(),
196196
style: style,

0 commit comments

Comments
 (0)