From 5c9fd8663122768721367d14b8d4f9bc15d6bb45 Mon Sep 17 00:00:00 2001 From: Mathew Polzin Date: Sat, 9 Dec 2023 18:57:12 -0600 Subject: [PATCH] use modern if-let syntax --- Sources/OpenAPIKit/Example.swift | 2 +- Sources/OpenAPIKit/Header/DereferencedHeader.swift | 2 +- Sources/OpenAPIKit/Link.swift | 2 +- Sources/OpenAPIKit/Parameter/DereferencedParameter.swift | 2 +- Sources/OpenAPIKit/Path Item/DereferencedPathItem.swift | 2 +- Sources/OpenAPIKit/Request/DereferencedRequest.swift | 2 +- Sources/OpenAPIKit/Response/DereferencedResponse.swift | 2 +- Sources/OpenAPIKit/Schema Object/DereferencedJSONSchema.swift | 4 ++-- Sources/OpenAPIKit/Schema Object/JSONSchema+Combining.swift | 4 ++-- Sources/OpenAPIKit/Schema Object/JSONSchema.swift | 2 +- Sources/OpenAPIKit/Security/SecurityScheme.swift | 2 +- Sources/OpenAPIKit30/Example.swift | 2 +- Sources/OpenAPIKit30/Header/DereferencedHeader.swift | 2 +- Sources/OpenAPIKit30/Link.swift | 2 +- Sources/OpenAPIKit30/Parameter/DereferencedParameter.swift | 2 +- Sources/OpenAPIKit30/Path Item/DereferencedPathItem.swift | 2 +- Sources/OpenAPIKit30/Request/DereferencedRequest.swift | 2 +- Sources/OpenAPIKit30/Response/DereferencedResponse.swift | 2 +- Sources/OpenAPIKit30/Schema Object/JSONSchema+Combining.swift | 4 ++-- Sources/OpenAPIKit30/Schema Object/JSONSchema.swift | 2 +- Sources/OpenAPIKit30/Security/SecurityScheme.swift | 2 +- Sources/OpenAPIKitCompat/Compat30To31.swift | 4 ++-- 22 files changed, 26 insertions(+), 26 deletions(-) diff --git a/Sources/OpenAPIKit/Example.swift b/Sources/OpenAPIKit/Example.swift index 457edcc76..0ef738ee2 100644 --- a/Sources/OpenAPIKit/Example.swift +++ b/Sources/OpenAPIKit/Example.swift @@ -195,7 +195,7 @@ extension OpenAPI.Example: LocallyDereferenceable { dereferencedFromComponentNamed name: String? ) throws -> OpenAPI.Example{ var vendorExtensions = self.vendorExtensions - if let name = name { + if let name { vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit/Header/DereferencedHeader.swift b/Sources/OpenAPIKit/Header/DereferencedHeader.swift index 5f8eee40b..18f453a6c 100644 --- a/Sources/OpenAPIKit/Header/DereferencedHeader.swift +++ b/Sources/OpenAPIKit/Header/DereferencedHeader.swift @@ -57,7 +57,7 @@ public struct DereferencedHeader: Equatable { } var header = header - if let name = name { + if let name { header.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit/Link.swift b/Sources/OpenAPIKit/Link.swift index 428e7c280..d1d2ac4b4 100644 --- a/Sources/OpenAPIKit/Link.swift +++ b/Sources/OpenAPIKit/Link.swift @@ -274,7 +274,7 @@ extension OpenAPI.Link: LocallyDereferenceable { dereferencedFromComponentNamed name: String? ) throws -> OpenAPI.Link { var vendorExtensions = self.vendorExtensions - if let name = name { + if let name { vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit/Parameter/DereferencedParameter.swift b/Sources/OpenAPIKit/Parameter/DereferencedParameter.swift index 97fb607b7..f2cdf232a 100644 --- a/Sources/OpenAPIKit/Parameter/DereferencedParameter.swift +++ b/Sources/OpenAPIKit/Parameter/DereferencedParameter.swift @@ -59,7 +59,7 @@ public struct DereferencedParameter: Equatable { } var parameter = parameter - if let name = name { + if let name { parameter.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit/Path Item/DereferencedPathItem.swift b/Sources/OpenAPIKit/Path Item/DereferencedPathItem.swift index 7b711b1b1..93767b025 100644 --- a/Sources/OpenAPIKit/Path Item/DereferencedPathItem.swift +++ b/Sources/OpenAPIKit/Path Item/DereferencedPathItem.swift @@ -65,7 +65,7 @@ public struct DereferencedPathItem: Equatable { self.trace = try pathItem.trace.map { try DereferencedOperation($0, resolvingIn: components, following: references) } var pathItem = pathItem - if let name = name { + if let name { pathItem.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit/Request/DereferencedRequest.swift b/Sources/OpenAPIKit/Request/DereferencedRequest.swift index 6e54e0c40..e7da192a5 100644 --- a/Sources/OpenAPIKit/Request/DereferencedRequest.swift +++ b/Sources/OpenAPIKit/Request/DereferencedRequest.swift @@ -38,7 +38,7 @@ public struct DereferencedRequest: Equatable { } var request = request - if let name = name { + if let name { request.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit/Response/DereferencedResponse.swift b/Sources/OpenAPIKit/Response/DereferencedResponse.swift index 76e883179..c61ae5c7b 100644 --- a/Sources/OpenAPIKit/Response/DereferencedResponse.swift +++ b/Sources/OpenAPIKit/Response/DereferencedResponse.swift @@ -51,7 +51,7 @@ public struct DereferencedResponse: Equatable { } var response = response - if let name = name { + if let name { response.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit/Schema Object/DereferencedJSONSchema.swift b/Sources/OpenAPIKit/Schema Object/DereferencedJSONSchema.swift index 509df1c09..077021b34 100644 --- a/Sources/OpenAPIKit/Schema Object/DereferencedJSONSchema.swift +++ b/Sources/OpenAPIKit/Schema Object/DereferencedJSONSchema.swift @@ -457,7 +457,7 @@ extension JSONSchema: LocallyDereferenceable { ) throws -> DereferencedJSONSchema { func addComponentNameExtension(to context: CoreContext) -> CoreContext { var extensions = context.vendorExtensions - if let name = name { + if let name { extensions[OpenAPI.Components.componentNameExtension] = .init(name) } return context.with(vendorExtensions: extensions) @@ -479,7 +479,7 @@ extension JSONSchema: LocallyDereferenceable { // TODO: consider which other core context properties to override here as with description ^ var extensions = dereferenced.vendorExtensions - if let name = name { + if let name { extensions[OpenAPI.Components.componentNameExtension] = .init(name) } dereferenced = dereferenced.with(vendorExtensions: vendorExtensions) diff --git a/Sources/OpenAPIKit/Schema Object/JSONSchema+Combining.swift b/Sources/OpenAPIKit/Schema Object/JSONSchema+Combining.swift index a8f48b3a5..06179aa46 100644 --- a/Sources/OpenAPIKit/Schema Object/JSONSchema+Combining.swift +++ b/Sources/OpenAPIKit/Schema Object/JSONSchema+Combining.swift @@ -608,7 +608,7 @@ extension JSONSchema.CoreContext { extension JSONSchema.IntegerContext { internal func validatedContext() throws -> JSONSchema.IntegerContext { let validatedMinimum: Bound? - if let minimum = minimum { + if let minimum { guard minimum.value >= 0 else { throw JSONSchemaResolutionError(.inconsistency("Integer minimum (\(minimum.value) cannot be below 0")) } @@ -633,7 +633,7 @@ extension JSONSchema.IntegerContext { extension JSONSchema.NumericContext { internal func validatedContext() throws -> JSONSchema.NumericContext { let validatedMinimum: Bound? - if let minimum = minimum { + if let minimum { guard minimum.value >= 0 else { throw JSONSchemaResolutionError(.inconsistency("Number minimum (\(minimum.value) cannot be below 0")) } diff --git a/Sources/OpenAPIKit/Schema Object/JSONSchema.swift b/Sources/OpenAPIKit/Schema Object/JSONSchema.swift index 9eebc8428..6f27102a6 100644 --- a/Sources/OpenAPIKit/Schema Object/JSONSchema.swift +++ b/Sources/OpenAPIKit/Schema Object/JSONSchema.swift @@ -1897,7 +1897,7 @@ extension JSONSchema: Decodable { // TODO: support multiple types instead of just grabbing the first one (see TODO immediately above as well) let typeHint = typeHints.first - if let typeHint = typeHint { + if let typeHint { let keysFromElsewhere = keysFrom.filter({ $0 != typeHint.group }) if !keysFromElsewhere.isEmpty { _warnings.append( diff --git a/Sources/OpenAPIKit/Security/SecurityScheme.swift b/Sources/OpenAPIKit/Security/SecurityScheme.swift index 2a33e1acd..ee15c6f0c 100644 --- a/Sources/OpenAPIKit/Security/SecurityScheme.swift +++ b/Sources/OpenAPIKit/Security/SecurityScheme.swift @@ -267,7 +267,7 @@ extension OpenAPI.SecurityScheme: LocallyDereferenceable { dereferencedFromComponentNamed name: String? ) throws -> OpenAPI.SecurityScheme { var ret = self - if let name = name { + if let name { ret.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } return ret diff --git a/Sources/OpenAPIKit30/Example.swift b/Sources/OpenAPIKit30/Example.swift index 013f5b213..ad0786843 100644 --- a/Sources/OpenAPIKit30/Example.swift +++ b/Sources/OpenAPIKit30/Example.swift @@ -171,7 +171,7 @@ extension OpenAPI.Example: LocallyDereferenceable { dereferencedFromComponentNamed name: String? ) throws -> OpenAPI.Example{ var vendorExtensions = self.vendorExtensions - if let name = name { + if let name { vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit30/Header/DereferencedHeader.swift b/Sources/OpenAPIKit30/Header/DereferencedHeader.swift index 5f8eee40b..18f453a6c 100644 --- a/Sources/OpenAPIKit30/Header/DereferencedHeader.swift +++ b/Sources/OpenAPIKit30/Header/DereferencedHeader.swift @@ -57,7 +57,7 @@ public struct DereferencedHeader: Equatable { } var header = header - if let name = name { + if let name { header.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit30/Link.swift b/Sources/OpenAPIKit30/Link.swift index 21c56ca7c..b6585d98a 100644 --- a/Sources/OpenAPIKit30/Link.swift +++ b/Sources/OpenAPIKit30/Link.swift @@ -263,7 +263,7 @@ extension OpenAPI.Link: LocallyDereferenceable { dereferencedFromComponentNamed name: String? ) throws -> OpenAPI.Link { var vendorExtensions = self.vendorExtensions - if let name = name { + if let name { vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit30/Parameter/DereferencedParameter.swift b/Sources/OpenAPIKit30/Parameter/DereferencedParameter.swift index 97fb607b7..f2cdf232a 100644 --- a/Sources/OpenAPIKit30/Parameter/DereferencedParameter.swift +++ b/Sources/OpenAPIKit30/Parameter/DereferencedParameter.swift @@ -59,7 +59,7 @@ public struct DereferencedParameter: Equatable { } var parameter = parameter - if let name = name { + if let name { parameter.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit30/Path Item/DereferencedPathItem.swift b/Sources/OpenAPIKit30/Path Item/DereferencedPathItem.swift index 7b711b1b1..93767b025 100644 --- a/Sources/OpenAPIKit30/Path Item/DereferencedPathItem.swift +++ b/Sources/OpenAPIKit30/Path Item/DereferencedPathItem.swift @@ -65,7 +65,7 @@ public struct DereferencedPathItem: Equatable { self.trace = try pathItem.trace.map { try DereferencedOperation($0, resolvingIn: components, following: references) } var pathItem = pathItem - if let name = name { + if let name { pathItem.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit30/Request/DereferencedRequest.swift b/Sources/OpenAPIKit30/Request/DereferencedRequest.swift index 18d37c70d..454e4c7aa 100644 --- a/Sources/OpenAPIKit30/Request/DereferencedRequest.swift +++ b/Sources/OpenAPIKit30/Request/DereferencedRequest.swift @@ -38,7 +38,7 @@ public struct DereferencedRequest: Equatable { } var request = request - if let name = name { + if let name { request.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit30/Response/DereferencedResponse.swift b/Sources/OpenAPIKit30/Response/DereferencedResponse.swift index 76e883179..c61ae5c7b 100644 --- a/Sources/OpenAPIKit30/Response/DereferencedResponse.swift +++ b/Sources/OpenAPIKit30/Response/DereferencedResponse.swift @@ -51,7 +51,7 @@ public struct DereferencedResponse: Equatable { } var response = response - if let name = name { + if let name { response.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } diff --git a/Sources/OpenAPIKit30/Schema Object/JSONSchema+Combining.swift b/Sources/OpenAPIKit30/Schema Object/JSONSchema+Combining.swift index 79adb97c1..e8097fed5 100644 --- a/Sources/OpenAPIKit30/Schema Object/JSONSchema+Combining.swift +++ b/Sources/OpenAPIKit30/Schema Object/JSONSchema+Combining.swift @@ -578,7 +578,7 @@ extension JSONSchema.CoreContext { extension JSONSchema.IntegerContext { internal func validatedContext() throws -> JSONSchema.IntegerContext { let validatedMinimum: Bound? - if let minimum = minimum { + if let minimum { guard minimum.value >= 0 else { throw JSONSchemaResolutionError(.inconsistency("Integer minimum (\(minimum.value) cannot be below 0")) } @@ -603,7 +603,7 @@ extension JSONSchema.IntegerContext { extension JSONSchema.NumericContext { internal func validatedContext() throws -> JSONSchema.NumericContext { let validatedMinimum: Bound? - if let minimum = minimum { + if let minimum { guard minimum.value >= 0 else { throw JSONSchemaResolutionError(.inconsistency("Number minimum (\(minimum.value) cannot be below 0")) } diff --git a/Sources/OpenAPIKit30/Schema Object/JSONSchema.swift b/Sources/OpenAPIKit30/Schema Object/JSONSchema.swift index 514bf3659..93dc1b10a 100644 --- a/Sources/OpenAPIKit30/Schema Object/JSONSchema.swift +++ b/Sources/OpenAPIKit30/Schema Object/JSONSchema.swift @@ -1831,7 +1831,7 @@ extension JSONSchema: Decodable { ) } - if let typeHint = typeHint { + if let typeHint { let keysFromElsewhere = keysFrom.filter({ $0 != typeHint.group }) if !keysFromElsewhere.isEmpty { _warnings.append( diff --git a/Sources/OpenAPIKit30/Security/SecurityScheme.swift b/Sources/OpenAPIKit30/Security/SecurityScheme.swift index 516471f21..8b883491e 100644 --- a/Sources/OpenAPIKit30/Security/SecurityScheme.swift +++ b/Sources/OpenAPIKit30/Security/SecurityScheme.swift @@ -244,7 +244,7 @@ extension OpenAPI.SecurityScheme: LocallyDereferenceable { dereferencedFromComponentNamed name: String? ) throws -> OpenAPI.SecurityScheme { var ret = self - if let name = name { + if let name { ret.vendorExtensions[OpenAPI.Components.componentNameExtension] = .init(name) } return ret diff --git a/Sources/OpenAPIKitCompat/Compat30To31.swift b/Sources/OpenAPIKitCompat/Compat30To31.swift index 92629cf08..444aabfea 100644 --- a/Sources/OpenAPIKitCompat/Compat30To31.swift +++ b/Sources/OpenAPIKitCompat/Compat30To31.swift @@ -172,7 +172,7 @@ extension OpenAPIKit30.OpenAPI.Parameter.SchemaContext: To31 { let newExamples = examples?.mapValues(eitherRefTo31) switch schema { case .a(let ref): - if let newExamples = newExamples { + if let newExamples { return OpenAPIKit.OpenAPI.Parameter.SchemaContext( schemaReference: .init(ref.to31()), style: style, @@ -190,7 +190,7 @@ extension OpenAPIKit30.OpenAPI.Parameter.SchemaContext: To31 { ) } case .b(let schema): - if let newExamples = newExamples { + if let newExamples { return OpenAPIKit.OpenAPI.Parameter.SchemaContext( schema.to31(), style: style,