Opt in to swift 5.9 rules for swiftformat

SwiftScream · Jun 2, 2024 · 0cc13b1 · 0cc13b1
1 parent 8430a6a
commit 0cc13b1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/.swift-version b/.swift-version
@@ -0,0 +1 @@
+5.9
diff --git a/.swiftformat b/.swiftformat
@@ -1,4 +1,3 @@
---swiftversion 5.7
 --exclude .build
 
 # rules

diff --git a/Sources/ScreamURITemplate/Internal/ValueFormatting.swift b/Sources/ScreamURITemplate/Internal/ValueFormatting.swift
@@ -47,11 +47,10 @@ func percentEncode(string: String, withAllowedCharacters allowedCharacterSet: Ch
 
 extension StringProtocol {
     func formatForTemplateExpansion(variableSpec: VariableSpec, expansionConfiguration: ExpansionConfiguration) throws -> String {
-        let modifiedValue: String
-        if let prefixLength = variableSpec.prefixLength() {
-            modifiedValue = String(prefix(prefixLength))
+        let modifiedValue = if let prefixLength = variableSpec.prefixLength() {
+            String(prefix(prefixLength))
         } else {
-            modifiedValue = String(self)
+            String(self)
         }
         let encodedExpansion = try percentEncode(string: modifiedValue, withAllowedCharacters: expansionConfiguration.percentEncodingAllowedCharacterSet, allowPercentEncodedTriplets: expansionConfiguration.allowPercentEncodedTriplets)
         if expansionConfiguration.named {