Use new shorthand syntax for unwrapping optionals

Sources/Basics/AuthorizationProvider.swift

@@ -97,7 +97,7 @@ public class NetrcAuthorizationProvider: AuthorizationProvider, AuthorizationWri
                 let contents = try? self.fileSystem.readFileContents(self.path).contents
                 try self.fileSystem.writeFileContents(self.path) { stream in
                     // Write existing contents
-                    if let contents = contents, !contents.isEmpty {
+                    if let contents, !contents.isEmpty {
                         stream.write(contents)
                         stream.write("\n")
                     }

Sources/Basics/Concurrency/SendableBox.swift

@@ -25,13 +25,13 @@ public actor SendableBox<Value: Sendable> {
 
 extension SendableBox where Value == Int {
     func increment() {
-        if let value = self.value {
+        if let value {
             self.value = value + 1
         }
     }
 
     func decrement() {
-        if let value = self.value {
+        if let value {
             self.value = value - 1
         }
     }

Sources/Basics/FileSystem/VirtualFileSystem.swift

@@ -215,7 +215,7 @@ public class VirtualFileSystem: FileSystem {
         switch node {
         case .directory(_, _, _): throw Errors.notAFile(path: path)
         case .file(_, _, _, let contents):
-            if let contents = contents {
+            if let contents {
                 return ByteString(contents)
             } else {
                 return ""

Sources/Basics/HTTPClient/URLSessionHTTPClient.swift

@@ -157,7 +157,7 @@ private class DataTaskManager: NSObject, URLSessionDataDelegate {
         guard let task = self.tasks.removeValue(forKey: task.taskIdentifier) else {
             return
         }
-        if let error = error {
+        if let error {
             task.completionHandler(.failure(error))
         } else if let response = task.response {
             task.completionHandler(.success(response.response(body: task.buffer)))
@@ -294,7 +294,7 @@ private class DownloadTaskManager: NSObject, URLSessionDownloadDelegate {
         }
 
         do {
-            if let error = error {
+            if let error {
                 throw HTTPClientError.downloadError("\(error)")
             } else if let error = task.moveFileError {
                 throw error

Sources/Basics/SQLite.swift

@@ -87,7 +87,7 @@ public final class SQLite {
 
         sqlite3_free(query)
 
-        if let err = err {
+        if let err {
             let errorString = String(cString: err)
             sqlite3_free(err)
             throw StringError(errorString)
@@ -286,7 +286,7 @@ public final class SQLite {
             case "database or disk is full":
                 throw Errors.databaseFull
             default:
-                if let prefix = prefix {
+                if let prefix {
                     description = "\(prefix): \(description)"
                 }
                 throw StringError(description)
@@ -309,8 +309,8 @@ private func sqlite_callback(
     _ columns: UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>?,
     _ columnNames: UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>?
 ) -> Int32 {
-    guard let ctx = ctx else { return 0 }
-    guard let columnNames = columnNames, let columns = columns else { return 0 }
+    guard let ctx else { return 0 }
+    guard let columnNames, let columns else { return 0 }
     let numColumns = Int(numColumns)
     var result: [SQLite.Column] = []
 

Sources/Basics/SwiftVersion.swift

@@ -35,7 +35,7 @@ public struct SwiftVersion {
         if self.isDevelopment {
             result += "-dev"
         }
-        if let buildIdentifier = self.buildIdentifier {
+        if let buildIdentifier {
             result += " (" + buildIdentifier + ")"
         }
         return result

Sources/Build/BuildDescription/ClangTargetBuildDescription.swift

@@ -231,7 +231,7 @@ public final class ClangTargetBuildDescription {
         // Include the path to the resource header unless the arguments are
         // being evaluated for a C file. A C file cannot depend on the resource
         // accessor header due to it exporting a Foundation type (`NSBundle`).
-        if let resourceAccessorHeaderFile = self.resourceAccessorHeaderFile, !isC {
+        if let resourceAccessorHeaderFile, !isC {
             args += ["-include", resourceAccessorHeaderFile.pathString]
         }
 
@@ -304,7 +304,7 @@ public final class ClangTargetBuildDescription {
     /// Generate the resource bundle accessor, if appropriate.
     private func generateResourceAccessor() throws {
         // Only generate access when we have a bundle and ObjC files.
-        guard let bundlePath = self.bundlePath, clangTarget.sources.containsObjcFiles else { return }
+        guard let bundlePath, clangTarget.sources.containsObjcFiles else { return }
 
         // Compute the basename of the bundle.
         let bundleBasename = bundlePath.basename

Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift

@@ -240,7 +240,7 @@ public final class SwiftTargetBuildDescription {
         self.toolsVersion = toolsVersion
         self.buildParameters = buildParameters
         // Unless mentioned explicitly, use the target type to determine if this is a test target.
-        if let testTargetRole = testTargetRole {
+        if let testTargetRole {
             self.testTargetRole = testTargetRole
         } else if target.type == .test {
             self.testTargetRole = .default
@@ -336,7 +336,7 @@ public final class SwiftTargetBuildDescription {
     /// Generate the resource bundle accessor, if appropriate.
     private func generateResourceAccessor() throws {
         // Do nothing if we're not generating a bundle.
-        guard let bundlePath = self.bundlePath else { return }
+        guard let bundlePath else { return }
 
         let mainPathSubstitution: String
         if self.buildParameters.triple.isWASI() {

Sources/Build/BuildOperation.swift

@@ -319,7 +319,7 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
     // Compiles a single plugin, emitting its output and throwing an error if it
     // fails.
     func compilePlugin(_ plugin: PluginDescription) throws {
-        guard let pluginConfiguration = self.pluginConfiguration else {
+        guard let pluginConfiguration else {
             throw InternalError("unknown plugin script runner")
         }
         // Compile the plugin, getting back a PluginCompilationResult.
@@ -408,7 +408,7 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
         let buildToolPluginInvocationResults: [ResolvedTarget: [BuildToolPluginInvocationResult]]
         let prebuildCommandResults: [ResolvedTarget: [PrebuildCommandResult]]
         // Invoke any build tool plugins in the graph to generate prebuild commands and build commands.
-        if let pluginConfiguration = self.pluginConfiguration  {
+        if let pluginConfiguration {
             let buildOperationForPluginDependencies = try BuildOperation(buildParameters: self.buildParameters.withDestination(self.buildParameters.hostTriple), cacheBuildManifest: false, packageGraphLoader: { return graph }, additionalFileRules: self.additionalFileRules, pkgConfigDirectories: self.pkgConfigDirectories, outputStream: self.outputStream, logLevel: self.logLevel, fileSystem: self.fileSystem, observabilityScope: self.observabilityScope)
             buildToolPluginInvocationResults = try graph.invokeBuildToolPlugins(
                 outputDir: pluginConfiguration.workDirectory.appending("outputs"),

Sources/Build/BuildOperationBuildSystemDelegateHandler.swift

@@ -916,7 +916,7 @@ private struct CommandTaskTracker {
             let fileNameStartIndex = command.description.index(after: lastDirectorySeparatorIndex)
             let fileName = command.description[fileNameStartIndex...]
 
-            if let targetName = targetName {
+            if let targetName {
                 return "\(action) \(targetName) \(fileName)"
             } else {
                 return "\(action) \(fileName)"

Sources/Build/LLBuildManifestBuilder.swift

@@ -292,10 +292,10 @@ extension LLBuildManifestBuilder {
 
             // Check if an explicit pre-build dependency job has already been
             // added as a part of this build.
-            if let uniqueDependencyTracker = uniqueExplicitDependencyTracker,
+            if let uniqueExplicitDependencyTracker,
                job.isExplicitDependencyPreBuildJob
             {
-                if try !uniqueDependencyTracker.registerExplicitDependencyBuildJob(job) {
+                if try !uniqueExplicitDependencyTracker.registerExplicitDependencyBuildJob(job) {
                     // This is a duplicate of a previously-seen identical job.
                     // Skip adding it to the manifest
                     continue
@@ -619,10 +619,10 @@ extension LLBuildManifestBuilder {
             // Depend on the binary for executable targets.
             if target.type == .executable {
                 // FIXME: Optimize.
-                let _product = try plan.graph.allProducts.first {
+                let product = try plan.graph.allProducts.first {
                     try $0.type == .executable && $0.executableTarget == target
                 }
-                if let product = _product {
+                if let product {
                     guard let planProduct = plan.productMap[product] else {
                         throw InternalError("unknown product \(product)")
                     }
@@ -855,8 +855,8 @@ extension LLBuildManifestBuilder {
             // Add language standard flag if needed.
             if let ext = path.source.extension {
                 for (standard, validExtensions) in standards {
-                    if let languageStandard = standard, validExtensions.contains(ext) {
-                        args += ["-std=\(languageStandard)"]
+                    if let standard, validExtensions.contains(ext) {
+                        args += ["-std=\(standard)"]
                     }
                 }
             }

Sources/Commands/PackageTools/ArchiveSource.swift

@@ -36,7 +36,7 @@ extension SwiftPackageTool {
             let packageDirectory = try globalOptions.locations.packageDirectory ?? swiftTool.getPackageRoot()
 
             let archivePath: AbsolutePath
-            if let output = output {
+            if let output {
                 archivePath = output
             } else {
                 let graph = try swiftTool.loadPackageGraph()

Sources/Commands/PackageTools/Learn.swift

@@ -33,7 +33,7 @@ extension SwiftPackageTool {
                 .map { try AbsolutePath(validating: $0, relativeTo: directory) }
                 .filter { fileSystem.isFile($0) }
 
-            guard let fileExtension = fileExtension else {
+            guard let fileExtension else {
                 return files
             }
 

Sources/Commands/PackageTools/ToolsVersionCommand.swift

@@ -40,7 +40,7 @@ struct ToolsVersionCommand: SwiftCommand {
 
     var toolsVersionMode: ToolsVersionMode {
         // TODO: enforce exclusivity
-        if let set = set {
+        if let set {
             return .set(set)
         } else if setCurrent {
             return .setCurrent

Sources/Commands/Snippets/CardStack.swift

@@ -58,7 +58,7 @@ struct CardStack {
     }
 
     func askForLineInput(prompt: String?) -> String? {
-        if let prompt = prompt {
+        if let prompt {
             print(brightBlack { prompt }.terminalString())
         }
         terminal.write(">>> ", inColor: .green, bold: true)
@@ -99,7 +99,7 @@ struct CardStack {
                     break askForLine
                 case let .pop(error):
                     cards.removeLast()
-                    if let error = error {
+                    if let error {
                         self.swiftTool.observabilityScope.emit(error)
                         needsToClearScreen = false
                     } else {

Sources/Commands/SwiftBuildTool.swift

@@ -43,12 +43,12 @@ struct BuildToolOptions: ParsableArguments {
     func buildSubset(observabilityScope: ObservabilityScope) -> BuildSubset? {
         var allSubsets: [BuildSubset] = []
 
-        if let productName = product {
-            allSubsets.append(.product(productName))
+        if let product {
+            allSubsets.append(.product(product))
         }
 
-        if let targetName = target {
-            allSubsets.append(.target(targetName))
+        if let target {
+            allSubsets.append(.target(target))
         }
 
         if buildTests {

Sources/Commands/SwiftTestTool.swift

@@ -668,13 +668,13 @@ final class TestRunner {
             throw TestError.xctestNotAvailable
         }
         args = [xctestPath.pathString]
-        if let xctestArg = xctestArg {
+        if let xctestArg {
             args += ["-XCTest", xctestArg]
         }
         args += [testPath.pathString]
         #else
         args += [testPath.description]
-        if let xctestArg = xctestArg {
+        if let xctestArg {
             args += [xctestArg]
         }
         #endif

Sources/Commands/Utilities/APIDigester.swift

@@ -226,7 +226,7 @@ public struct SwiftAPIDigester {
             "-module", module
         ]
         args.append(contentsOf: try buildPlan.createAPIToolCommonArgs(includeLibrarySearchPaths: false))
-        if let breakageAllowlistPath = breakageAllowlistPath {
+        if let breakageAllowlistPath {
             args.append(contentsOf: ["-breakage-allowlist-path", breakageAllowlistPath.pathString])
         }
 

Sources/Commands/Utilities/DescribedPackage.swift

@@ -350,7 +350,7 @@ public struct PlainTextEncoder {
             private mutating func emit(_ key: CodingKey, _ value: String?) {
                 outputStream <<< String(repeating: "    ", count: codingPath.count)
                 outputStream <<< displayName(for: key) <<< ":"
-                if let value = value { outputStream <<< " " <<< value }
+                if let value { outputStream <<< " " <<< value }
                 outputStream <<< "\n"
             }
             mutating func encodeNil(forKey key: Key) throws { emit(key, "nil") }

Sources/CoreCommands/SwiftTool.swift

@@ -114,8 +114,8 @@ extension SwiftCommand {
         // wait for all observability items to process
         swiftTool.waitForObservabilityEvents(timeout: .now() + 5)
 
-        if let error = toolError {
-            throw error
+        if let toolError {
+            throw toolError
         }
     }
 }
@@ -150,8 +150,8 @@ extension AsyncSwiftCommand {
         // wait for all observability items to process
         swiftTool.waitForObservabilityEvents(timeout: .now() + 5)
 
-        if let error = toolError {
-            throw error
+        if let toolError {
+            throw toolError
         }
     }
 }
@@ -690,7 +690,7 @@ public final class SwiftTool {
         customLogLevel: Basics.Diagnostic.Severity? = .none,
         customObservabilityScope: ObservabilityScope? = .none
     ) throws -> BuildSystem {
-        guard let buildSystemProvider = buildSystemProvider else {
+        guard let buildSystemProvider else {
             fatalError("build system provider not initialized")
         }
 

Sources/CoreCommands/SwiftToolObservabilityHandler.swift

@@ -181,7 +181,7 @@ private struct InteractiveWriter {
 
     /// Write the string to the contained terminal or stream.
     func write(_ string: String, inColor color: TerminalController.Color = .noColor, bold: Bool = false) {
-        if let term = self.term {
+        if let term {
             term.write(string, inColor: color, bold: bold)
         } else {
             string.write(to: stream)
@@ -190,7 +190,7 @@ private struct InteractiveWriter {
     }
 
     func format(_ string: String, inColor color: TerminalController.Color = .noColor, bold: Bool = false) -> String {
-        if let term = self.term {
+        if let term {
             return term.wrap(string, inColor: color, bold: bold)
         } else {
             return string
@@ -202,7 +202,7 @@ private struct InteractiveWriter {
 // we should remove this as we make use of the new scope and metadata to provide better contextual information
 extension ObservabilityMetadata {
     fileprivate var diagnosticPrefix: String? {
-        if let packageIdentity = self.packageIdentity {
+        if let packageIdentity {
             return "'\(packageIdentity)'"
         } else {
             return .none

Sources/CrossCompilationDestinationsTool/Configuration/SetConfiguration.swift

@@ -87,18 +87,18 @@ struct SetConfiguration: ConfigurationCommand {
 
         let currentWorkingDirectory = fileSystem.currentWorkingDirectory
 
-        if let sdkRootPath = sdkRootPath {
+        if let sdkRootPath {
             configuration.sdkRootPath = try AbsolutePath(validating: sdkRootPath, relativeTo: currentWorkingDirectory)
             updatedProperties.append(CodingKeys.sdkRootPath.stringValue)
         }
 
-        if let swiftResourcesPath = swiftResourcesPath {
+        if let swiftResourcesPath {
             configuration.swiftResourcesPath =
                 try AbsolutePath(validating: swiftResourcesPath, relativeTo: currentWorkingDirectory)
             updatedProperties.append(CodingKeys.swiftResourcesPath.stringValue)
         }
 
-        if let swiftStaticResourcesPath = swiftStaticResourcesPath {
+        if let swiftStaticResourcesPath {
             configuration.swiftResourcesPath =
                 try AbsolutePath(validating: swiftStaticResourcesPath, relativeTo: currentWorkingDirectory)
             updatedProperties.append(CodingKeys.swiftStaticResourcesPath.stringValue)
@@ -147,7 +147,7 @@ struct SetConfiguration: ConfigurationCommand {
 
 extension AbsolutePath {
     fileprivate init(validating string: String, relativeTo basePath: AbsolutePath?) throws {
-        if let basePath = basePath {
+        if let basePath {
             try self.init(validating: string, relativeTo: basePath)
         } else {
             try self.init(validating: string)

Sources/CrossCompilationDestinationsTool/DestinationCommand.swift

@@ -84,8 +84,8 @@ extension DestinationCommand {
         // wait for all observability items to process
         observabilityHandler.wait(timeout: .now() + 5)
 
-        if let error = commandError {
-            throw error
+        if let commandError {
+            throw commandError
         }
     }
 }