Revert "Avoid using temp_await on loadRootPackage (#7009)"

This reverts commit 6bed023.

Author: MaxDesiatov

.swiftpm/xcode/xcshareddata/xcschemes/SwiftPM-Package.xcscheme

@@ -839,16 +839,6 @@
                ReferencedContainer = "container:">
             </BuildableReference>
          </TestableReference>
-         <TestableReference
-            skipped = "NO">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "SourceKitLSPAPITests"
-               BuildableName = "SourceKitLSPAPITests"
-               BlueprintName = "SourceKitLSPAPITests"
-               ReferencedContainer = "container:">
-            </BuildableReference>
-         </TestableReference>
       </Testables>
    </TestAction>
    <LaunchAction

Sources/Commands/PackageTools/Describe.swift

@@ -19,7 +19,7 @@ import PackageModel
 import struct TSCBasic.StringError
 
 extension SwiftPackageTool {
-    struct Describe: AsyncSwiftCommand {
+    struct Describe: SwiftCommand {
         static let configuration = CommandConfiguration(
             abstract: "Describe the current package")
 
@@ -29,18 +29,21 @@ extension SwiftPackageTool {
         @Option(help: "json | text")
         var type: DescribeMode = .text
 
-        func run(_ swiftTool: SwiftTool) async throws {
+        func run(_ swiftTool: SwiftTool) throws {
             let workspace = try swiftTool.getActiveWorkspace()
 
             guard let packagePath = try swiftTool.getWorkspaceRoot().packages.first else {
                 throw StringError("unknown package")
             }
 
-            let package = try await workspace.loadRootPackage(
-                at: packagePath,
-                observabilityScope: swiftTool.observabilityScope
-            )
-
+            let package = try temp_await {
+                workspace.loadRootPackage(
+                    at: packagePath,
+                    observabilityScope: swiftTool.observabilityScope,
+                    completion: $0
+                )
+            }
+            
             try self.describe(package, in: type)
         }
 

Sources/Commands/PackageTools/DumpCommands.swift

@@ -97,21 +97,24 @@ enum ExtensionBlockSymbolBehavior: String, EnumerableFlag {
     case omitExtensionBlockSymbols
 }
 
-struct DumpPackage: AsyncSwiftCommand {
+struct DumpPackage: SwiftCommand {
     static let configuration = CommandConfiguration(
         abstract: "Print parsed Package.swift as JSON")
 
     @OptionGroup(visibility: .hidden)
     var globalOptions: GlobalOptions
 
-    func run(_ swiftTool: SwiftTool) async throws {
+    func run(_ swiftTool: SwiftTool) throws {
         let workspace = try swiftTool.getActiveWorkspace()
         let root = try swiftTool.getWorkspaceRoot()
 
-        let rootManifests = try await workspace.loadRootManifests(
-            packages: root.packages,
-            observabilityScope: swiftTool.observabilityScope
-        )
+        let rootManifests = try temp_await {
+            workspace.loadRootManifests(
+                packages: root.packages,
+                observabilityScope: swiftTool.observabilityScope,
+                completion: $0
+            )
+        }
         guard let rootManifest = rootManifests.values.first else {
             throw StringError("invalid manifests at \(root.packages)")
         }

Sources/Commands/PackageTools/Format.swift

@@ -21,7 +21,7 @@ import enum TSCBasic.ProcessEnv
 import enum TSCUtility.Diagnostics
 
 extension SwiftPackageTool {
-    struct Format: AsyncSwiftCommand {
+    struct Format: SwiftCommand {
         static let configuration = CommandConfiguration(
             commandName: "_format", shouldDisplay: false)
 
@@ -32,7 +32,7 @@ extension SwiftPackageTool {
                   help: "Pass flag through to the swift-format tool")
         var swiftFormatFlags: [String] = []
 
-        func run(_ swiftTool: SwiftTool) async throws {
+        func run(_ swiftTool: SwiftTool) throws {
             // Look for swift-format binary.
             // FIXME: This should be moved to user toolchain.
             let swiftFormatInEnv = lookupExecutablePath(filename: ProcessEnv.vars["SWIFT_FORMAT"])
@@ -48,11 +48,13 @@ extension SwiftPackageTool {
                 throw StringError("unknown package")
             }
 
-            let package = try await workspace.loadRootPackage(
-                at: packagePath,
-                observabilityScope: swiftTool.observabilityScope
-            )
-
+            let package = try temp_await {
+                workspace.loadRootPackage(
+                    at: packagePath,
+                    observabilityScope: swiftTool.observabilityScope,
+                    completion: $0
+                )
+            }
 
             // Use the user provided flags or default to formatting mode.
             let formatOptions = swiftFormatFlags.isEmpty
@@ -69,7 +71,7 @@ extension SwiftPackageTool {
             let args = [swiftFormat.pathString] + formatOptions + [packagePath.pathString] + paths
             print("Running:", args.map{ $0.spm_shellEscaped() }.joined(separator: " "))
 
-            let result = try await TSCBasic.Process.popen(arguments: args)
+            let result = try TSCBasic.Process.popen(arguments: args)
             let output = try (result.utf8Output() + result.utf8stderrOutput())
 
             if result.exitStatus != .terminated(code: 0) {

Sources/Commands/PackageTools/SwiftPackageTool.swift

@@ -25,7 +25,7 @@ import XCBuildSupport
 import enum TSCUtility.Diagnostics
 
 /// swift-package tool namespace
-public struct SwiftPackageTool: AsyncParsableCommand {
+public struct SwiftPackageTool: ParsableCommand {
     public static var configuration = CommandConfiguration(
         commandName: "package",
         _superCommandName: "swift",

Sources/SPMTestSupport/MockWorkspace.swift

@@ -510,16 +510,13 @@ public final class MockWorkspace {
         public let diagnostics: [Basics.Diagnostic]
     }
 
-    public func checkPrecomputeResolution() async throws -> ResolutionPrecomputationResult {
+    public func checkPrecomputeResolution(_ check: (ResolutionPrecomputationResult) -> Void) throws {
         let observability = ObservabilitySystem.makeForTesting()
         let workspace = try self.getOrCreateWorkspace()
         let pinsStore = try workspace.pinsStore.load()
 
         let rootInput = PackageGraphRootInput(packages: try rootPaths(for: roots.map { $0.name }), dependencies: [])
-        let rootManifests = try await workspace.loadRootManifests(
-            packages: rootInput.packages,
-            observabilityScope: observability.topScope
-        )
+        let rootManifests = try temp_await { workspace.loadRootManifests(packages: rootInput.packages, observabilityScope: observability.topScope, completion: $0) }
         let root = PackageGraphRoot(input: rootInput, manifests: rootManifests, observabilityScope: observability.topScope)
 
         let dependencyManifests = try workspace.loadDependencyManifests(root: root, observabilityScope: observability.topScope)
@@ -532,7 +529,7 @@ public final class MockWorkspace {
             observabilityScope: observability.topScope
         )
 
-        return ResolutionPrecomputationResult(result: result, diagnostics: observability.diagnostics)
+        check(ResolutionPrecomputationResult(result: result, diagnostics: observability.diagnostics))
     }
 
     public func set(

Sources/swift-package-manager/SwiftPM.swift

@@ -25,7 +25,7 @@ struct SwiftPM {
     static func main() async {
         switch execName {
         case "swift-package":
-            await SwiftPackageTool.main()
+            SwiftPackageTool.main()
         case "swift-build":
             SwiftBuildTool.main()
         case "swift-experimental-sdk":

Sources/swift-package/CMakeLists.txt

@@ -7,13 +7,10 @@
 # See http://swift.org/CONTRIBUTORS.txt for Swift project authors
 
 add_executable(swift-package
-  Entrypoint.swift)
+  main.swift)
 target_link_libraries(swift-package PRIVATE
   Commands
   TSCBasic)
 
-target_compile_options(swift-package PRIVATE
-  -parse-as-library)
-
 install(TARGETS swift-package
   RUNTIME DESTINATION bin)

Sources/swift-package/Entrypoint.swift renamed to Sources/swift-package/main.swift

@@ -12,9 +12,4 @@
 
 import Commands
 
-@main
-struct Entrypoint {
-    static func main() async {
-        await SwiftPackageTool.main()
-    }
-}
+SwiftPackageTool.main()