[5.9] Fix symlinked swift-experimental-destination invocations (#6383)

`swift experimental-destination` subcommands no longer work and always display help output. This is a regression introduced in #6362 after making `SwiftDestinationTool` conform to  `AsyncParsableCommand` instead of `ParsableCommand` but not updating `swift-package-manager` command sources to call `async` overload of `main()` function on `SwiftDestinationTool`.

rdar://107618266

Author: MaxDesiatov

Sources/CrossCompilationDestinationsTool/DestinationCommand.swift

@@ -22,7 +22,7 @@ import var TSCBasic.localFileSystem
 import var TSCBasic.stdoutStream
 
 /// A protocol for functions and properties common to all destination subcommands.
-protocol DestinationCommand: AsyncParsableCommand {
+protocol DestinationCommand: ParsableCommand {
     /// Common locations options provided by ArgumentParser.
     var locations: LocationOptions { get }
 
@@ -35,7 +35,7 @@ protocol DestinationCommand: AsyncParsableCommand {
         buildTimeTriple: Triple,
         _ destinationsDirectory: AbsolutePath,
         _ observabilityScope: ObservabilityScope
-    ) async throws
+    ) throws
 }
 
 extension DestinationCommand {
@@ -62,7 +62,7 @@ extension DestinationCommand {
         return destinationsDirectory
     }
 
-    public func run() async throws {
+    public func run() throws {
         let observabilityHandler = SwiftToolObservabilityHandler(outputStream: stdoutStream, logLevel: .info)
         let observabilitySystem = ObservabilitySystem(observabilityHandler)
         let observabilityScope = observabilitySystem.topScope
@@ -73,7 +73,7 @@ extension DestinationCommand {
 
         var commandError: Error? = nil
         do {
-            try await self.run(buildTimeTriple: triple, destinationsDirectory, observabilityScope)
+            try self.run(buildTimeTriple: triple, destinationsDirectory, observabilityScope)
             if observabilityScope.errorsReported {
                 throw ExitCode.failure
             }

Sources/CrossCompilationDestinationsTool/InstallDestination.swift

@@ -42,8 +42,8 @@ public struct InstallDestination: DestinationCommand {
         buildTimeTriple: Triple,
         _ destinationsDirectory: AbsolutePath,
         _ observabilityScope: ObservabilityScope
-    ) async throws {
-        try await DestinationBundle.install(
+    ) throws {
+        try DestinationBundle.install(
             bundlePathOrURL: bundlePathOrURL,
             destinationsDirectory: destinationsDirectory,
             self.fileSystem,

Sources/CrossCompilationDestinationsTool/SwiftDestinationTool.swift

@@ -13,7 +13,7 @@
 import ArgumentParser
 import Basics
 
-public struct SwiftDestinationTool: AsyncParsableCommand {
+public struct SwiftDestinationTool: ParsableCommand {
     public static let configuration = CommandConfiguration(
         commandName: "experimental-destination",
         _superCommandName: "swift",

Sources/PackageModel/DestinationBundle.swift

@@ -13,6 +13,7 @@
 import Basics
 
 import func TSCBasic.tsc_await
+import func TSCBasic.withTemporaryDirectory
 import protocol TSCBasic.FileSystem
 import struct Foundation.URL
 import struct TSCBasic.AbsolutePath
@@ -138,9 +139,8 @@ public struct DestinationBundle {
         _ fileSystem: some FileSystem,
         _ archiver: some Archiver,
         _ observabilityScope: ObservabilityScope
-    ) async throws {
-        _ = try await withTemporaryDirectory(
-            fileSystem: fileSystem,
+    ) throws {
+        _ = try withTemporaryDirectory(
             removeTreeOnDeinit: true
         ) { temporaryDirectory in
             let bundlePath: AbsolutePath
@@ -153,18 +153,21 @@ public struct DestinationBundle {
                 let bundleName = bundleURL.lastPathComponent
                 let downloadedBundlePath = temporaryDirectory.appending(component: bundleName)
 
-                let client = HTTPClient()
-                var request = HTTPClientRequest.download(
+                let client = LegacyHTTPClient()
+                var request = LegacyHTTPClientRequest.download(
                     url: bundleURL,
-                    fileSystem: AsyncFileSystem { fileSystem },
+                    fileSystem: fileSystem,
                     destination: downloadedBundlePath
                 )
                 request.options.validResponseCodes = [200]
-                _ = try await client.execute(
-                    request,
-                    observabilityScope: observabilityScope,
-                    progress: nil
-                )
+                _ = try tsc_await {
+                    client.execute(
+                        request,
+                        observabilityScope: observabilityScope,
+                        progress: nil,
+                        completion: $0
+                    )
+                }
 
                 bundlePath = downloadedBundlePath
 
@@ -178,15 +181,15 @@ public struct DestinationBundle {
                 throw DestinationError.invalidPathOrURL(bundlePathOrURL)
             }
 
-            try await installIfValid(
+            try installIfValid(
                 bundlePath: bundlePath,
                 destinationsDirectory: destinationsDirectory,
                 temporaryDirectory: temporaryDirectory,
                 fileSystem,
                 archiver,
                 observabilityScope
             )
-        }.value
+        }
 
         print("Destination artifact bundle at `\(bundlePathOrURL)` successfully installed.")
     }
@@ -205,7 +208,7 @@ public struct DestinationBundle {
         temporaryDirectory: AbsolutePath,
         _ fileSystem: some FileSystem,
         _ archiver: some Archiver
-    ) async throws -> AbsolutePath {
+    ) throws -> AbsolutePath {
         let regex = try RegEx(pattern: "(.+\\.artifactbundle).*")
 
         guard let bundleName = bundlePath.components.last else {
@@ -228,7 +231,7 @@ public struct DestinationBundle {
             return bundlePath
         }
 
-        try await archiver.extract(from: bundlePath, to: temporaryDirectory)
+        try tsc_await { archiver.extract(from: bundlePath, to: temporaryDirectory, completion: $0) }
 
         return temporaryDirectory.appending(component: unpackedBundleName)
     }
@@ -246,8 +249,8 @@ public struct DestinationBundle {
         _ fileSystem: some FileSystem,
         _ archiver: some Archiver,
         _ observabilityScope: ObservabilityScope
-    ) async throws {
-        let unpackedBundlePath = try await unpackIfNeeded(
+    ) throws {
+        let unpackedBundlePath = try unpackIfNeeded(
             bundlePath: bundlePath,
             destinationsDirectory: destinationsDirectory,
             temporaryDirectory: temporaryDirectory,

Sources/swift-experimental-destination/SwiftDestinationTool.swift

@@ -15,7 +15,7 @@ import Basics
 import CrossCompilationDestinationsTool
 
 @main
-struct SwiftDestinationTool: AsyncParsableCommand {
+struct SwiftDestinationTool: ParsableCommand {
     static let configuration = CommandConfiguration(
         commandName: "experimental-destination",
         _superCommandName: "swift",