[6.0] NFC: Rename ResolvedTarget to ResolvedModule (#7571)

- Explanation:

With host/target triples separation in the SwiftPM codebase, it gets
very confusing whether at a given moment "target" refers to a module, a
triple, or a low level build system target.

Renamed `ResolvedTarget` to `ResolvedModule`. Added a deprecated
`typealias ResolvedTarget = ResolvedModule` to allow graceful migration
for users of this type.

  Confusion between target triples and package targets is reduced.

This has no impact on how these concepts are named in user-visible APIs
like `PackageDescription` and `PackagePlugin`, target there can stay as
"target" for as long as needed.

Remaining internal uses of "target" outside of "target triple" context,
like `*TargetBuildDescription` will be renamed in future PRs.

- Scope: NFC change

- Main Branch PRs:
#7459

- Risk: Very Low

- Reviewed By: @bnbarham  

- Testing: No new tests are necessary


(cherry picked from commit 27996b8)

Co-authored-by: Max Desiatov <[email protected]>

Author: xedin

Sources/Build/BuildDescription/ClangTargetBuildDescription.swift

@@ -15,7 +15,7 @@ import PackageGraph
 import PackageLoading
 import PackageModel
 import struct PackageGraph.ModulesGraph
-import struct PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedModule
 import struct SPMBuildCore.BuildParameters
 import struct SPMBuildCore.BuildToolPluginInvocationResult
 import struct SPMBuildCore.PrebuildCommandResult
@@ -28,7 +28,7 @@ public final class ClangTargetBuildDescription {
     public let package: ResolvedPackage
 
     /// The target described by this target.
-    public let target: ResolvedTarget
+    public let target: ResolvedModule
 
     /// The underlying clang target.
     public let clangTarget: ClangTarget
@@ -114,7 +114,7 @@ public final class ClangTargetBuildDescription {
     /// Create a new target description with target and build parameters.
     init(
         package: ResolvedPackage,
-        target: ResolvedTarget,
+        target: ResolvedModule,
         toolsVersion: ToolsVersion,
         additionalFileRules: [FileRuleDescription] = [],
         buildParameters: BuildParameters,

Sources/Build/BuildDescription/PluginDescription.swift

@@ -43,7 +43,7 @@ public final class PluginDescription: Codable {
     /// Initialize a new plugin target description. The target is expected to be
     /// a `PluginTarget`.
     init(
-        target: ResolvedTarget,
+        target: ResolvedModule,
         products: [ResolvedProduct],
         package: ResolvedPackage,
         toolsVersion: ToolsVersion,

Sources/Build/BuildDescription/ProductBuildDescription.swift

@@ -50,7 +50,7 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
     var additionalFlags: [String] = []
 
     /// The list of targets that are going to be linked statically in this product.
-    var staticTargets: [ResolvedTarget] = []
+    var staticTargets: [ResolvedModule] = []
 
     /// The list of Swift modules that should be passed to the linker. This is required for debugging to work.
     var swiftASTs: SortedArray<AbsolutePath> = .init()

Sources/Build/BuildDescription/SwiftTargetBuildDescription.swift

@@ -34,7 +34,7 @@ public final class SwiftTargetBuildDescription {
     public let package: ResolvedPackage
 
     /// The target described by this target.
-    public let target: ResolvedTarget
+    public let target: ResolvedModule
 
     private let swiftTarget: SwiftTarget
 
@@ -244,7 +244,7 @@ public final class SwiftTargetBuildDescription {
     /// Create a new target description with target and build parameters.
     init(
         package: ResolvedPackage,
-        target: ResolvedTarget,
+        target: ResolvedModule,
         toolsVersion: ToolsVersion,
         additionalFileRules: [FileRuleDescription] = [],
         buildParameters: BuildParameters,

Sources/Build/BuildDescription/TargetBuildDescription.swift

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 import Basics
-import struct PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedModule
 import struct PackageModel.Resource
 import struct PackageModel.ToolsVersion
 import struct SPMBuildCore.BuildToolPluginInvocationResult
@@ -61,7 +61,7 @@ public enum TargetBuildDescription {
         }
     }
 
-    var target: ResolvedTarget {
+    var target: ResolvedModule {
         switch self {
         case .swift(let target):
             return target.target

Sources/Build/BuildManifest/LLBuildManifestBuilder+Clang.swift

@@ -14,7 +14,7 @@ import struct LLBuildManifest.Node
 import struct Basics.AbsolutePath
 import struct Basics.InternalError
 import class Basics.ObservabilityScope
-import struct PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedModule
 import PackageModel
 
 extension LLBuildManifestBuilder {
@@ -32,7 +32,7 @@ extension LLBuildManifestBuilder {
             inputs.append(resourcesNode)
         }
 
-        func addStaticTargetInputs(_ target: ResolvedTarget) {
+        func addStaticTargetInputs(_ target: ResolvedModule) {
             if case .swift(let desc)? = self.plan.targetMap[target.id], target.type == .library {
                 inputs.append(file: desc.moduleOutputPath)
             }

Sources/Build/BuildManifest/LLBuildManifestBuilder+Swift.swift

@@ -17,7 +17,7 @@ import struct Basics.TSCAbsolutePath
 import struct LLBuildManifest.Node
 import struct LLBuildManifest.LLBuildManifest
 import struct SPMBuildCore.BuildParameters
-import struct PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedModule
 import protocol TSCBasic.FileSystem
 import enum TSCBasic.ProcessEnv
 import func TSCBasic.topologicalSort
@@ -191,9 +191,9 @@ extension LLBuildManifestBuilder {
     public func addTargetsToExplicitBuildManifest() throws {
         // Sort the product targets in topological order in order to collect and "bubble up"
         // their respective dependency graphs to the depending targets.
-        let nodes: [ResolvedTarget.Dependency] = try self.plan.targetMap.keys.compactMap {
+        let nodes: [ResolvedModule.Dependency] = try self.plan.targetMap.keys.compactMap {
             guard let target = self.plan.graph.allTargets[$0] else { throw InternalError("unknown target \($0)") }
-            return ResolvedTarget.Dependency.target(target, conditions: [])
+            return ResolvedModule.Dependency.target(target, conditions: [])
         }
         let allPackageDependencies = try topologicalSort(nodes, successors: { $0.dependencies })
         // Instantiate the inter-module dependency oracle which will cache commonly-scanned
@@ -415,7 +415,7 @@ extension LLBuildManifestBuilder {
             inputs.append(resourcesNode)
         }
 
-        func addStaticTargetInputs(_ target: ResolvedTarget) throws {
+        func addStaticTargetInputs(_ target: ResolvedModule) throws {
             // Ignore C Modules.
             if target.underlying is SystemLibraryTarget { return }
             // Ignore Binary Modules.

Sources/Build/BuildManifest/LLBuildManifestBuilder.swift

@@ -316,7 +316,7 @@ extension TargetBuildDescription {
     }
 }
 
-extension ResolvedTarget {
+extension ResolvedModule {
     public func getCommandName(config: String) -> String {
         "C." + self.getLLBuildTargetName(config: config)
     }

Sources/Build/BuildOperation.swift

@@ -533,8 +533,8 @@ public final class BuildOperation: PackageStructureDelegate, SPMBuildCore.BuildS
     private func plan(subset: BuildSubset? = nil) throws -> (description: BuildDescription, manifest: LLBuildManifest) {
         // Load the package graph.
         let graph = try getPackageGraph()
-        let buildToolPluginInvocationResults: [ResolvedTarget.ID: (target: ResolvedTarget, results: [BuildToolPluginInvocationResult])]
-        let prebuildCommandResults: [ResolvedTarget.ID: [PrebuildCommandResult]]
+        let buildToolPluginInvocationResults: [ResolvedModule.ID: (target: ResolvedModule, results: [BuildToolPluginInvocationResult])]
+        let prebuildCommandResults: [ResolvedModule.ID: [PrebuildCommandResult]]
         // Invoke any build tool plugins in the graph to generate prebuild commands and build commands.
         if let pluginConfiguration, !self.productsBuildParameters.shouldSkipBuilding {
             // Hacky workaround for rdar://120560817, but it replicates precisely enough the original behavior before
@@ -877,7 +877,7 @@ extension BuildDescription {
 }
 
 extension BuildSubset {
-    func recursiveDependencies(for graph: ModulesGraph, observabilityScope: ObservabilityScope) throws -> [ResolvedTarget]? {
+    func recursiveDependencies(for graph: ModulesGraph, observabilityScope: ObservabilityScope) throws -> [ResolvedModule]? {
         switch self {
         case .allIncludingTests:
             return Array(graph.reachableTargets)

Sources/Build/BuildPlan/BuildPlan+Product.swift

@@ -14,7 +14,7 @@ import struct Basics.AbsolutePath
 import struct Basics.Triple
 import struct Basics.InternalError
 import struct PackageGraph.ResolvedProduct
-import struct PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedModule
 import class PackageModel.BinaryTarget
 import class PackageModel.ClangTarget
 
@@ -125,8 +125,8 @@ extension BuildPlan {
         buildParameters: BuildParameters
     ) throws -> (
         dylibs: [ResolvedProduct],
-        staticTargets: [ResolvedTarget],
-        systemModules: [ResolvedTarget],
+        staticTargets: [ResolvedModule],
+        systemModules: [ResolvedModule],
         libraryBinaryPaths: Set<AbsolutePath>,
         availableTools: [String: AbsolutePath]
     ) {
@@ -161,7 +161,7 @@ extension BuildPlan {
         }
 
         // Sort the product targets in topological order.
-        let nodes: [ResolvedTarget.Dependency] = product.targets.map { .target($0, conditions: []) }
+        let nodes: [ResolvedModule.Dependency] = product.targets.map { .target($0, conditions: []) }
         let allTargets = try topologicalSort(nodes, successors: { dependency in
             switch dependency {
             // Include all the dependencies of a target.
@@ -186,7 +186,7 @@ extension BuildPlan {
                     return []
                 }
 
-                let productDependencies: [ResolvedTarget.Dependency] = product.targets.map { .target($0, conditions: []) }
+                let productDependencies: [ResolvedModule.Dependency] = product.targets.map { .target($0, conditions: []) }
                 switch product.type {
                 case .library(.automatic), .library(.static):
                     return productDependencies
@@ -202,8 +202,8 @@ extension BuildPlan {
 
         // Create empty arrays to collect our results.
         var linkLibraries = [ResolvedProduct]()
-        var staticTargets = [ResolvedTarget]()
-        var systemModules = [ResolvedTarget]()
+        var staticTargets = [ResolvedModule]()
+        var systemModules = [ResolvedModule]()
         var libraryBinaryPaths: Set<AbsolutePath> = []
         var availableTools = [String: AbsolutePath]()
 

Sources/Build/BuildPlan/BuildPlan+Test.swift

@@ -17,7 +17,7 @@ import struct LLBuildManifest.TestDiscoveryTool
 import struct LLBuildManifest.TestEntryPointTool
 import struct PackageGraph.ModulesGraph
 import struct PackageGraph.ResolvedProduct
-import struct PackageGraph.ResolvedTarget
+import struct PackageGraph.ResolvedModule
 import struct PackageModel.Sources
 import class PackageModel.SwiftTarget
 import class PackageModel.Target
@@ -66,7 +66,7 @@ extension BuildPlan {
             }
 
             /// Generates test discovery targets, which contain derived sources listing the discovered tests.
-            func generateDiscoveryTargets() throws -> (target: SwiftTarget, resolved: ResolvedTarget, buildDescription: SwiftTargetBuildDescription) {
+            func generateDiscoveryTargets() throws -> (target: SwiftTarget, resolved: ResolvedModule, buildDescription: SwiftTargetBuildDescription) {
                 let discoveryTargetName = "\(package.manifest.displayName)PackageDiscoveredTests"
                 let discoveryDerivedDir = buildParameters.buildPath.appending(components: "\(discoveryTargetName).derived")
                 let discoveryMainFile = discoveryDerivedDir.appending(component: TestDiscoveryTool.mainFileName)
@@ -84,7 +84,7 @@ extension BuildPlan {
                     packageAccess: true, // test target is allowed access to package decls by default
                     testDiscoverySrc: Sources(paths: discoveryPaths, root: discoveryDerivedDir)
                 )
-                let discoveryResolvedTarget = ResolvedTarget(
+                let discoveryResolvedTarget = ResolvedModule(
                     packageIdentity: testProduct.packageIdentity,
                     underlying: discoveryTarget,
                     dependencies: testProduct.targets.map { .target($0, conditions: []) },
@@ -110,7 +110,7 @@ extension BuildPlan {
             /// point API and leverages the test discovery target to reference which tests to run.
             func generateSynthesizedEntryPointTarget(
                 swiftTargetDependencies: [Target.Dependency],
-                resolvedTargetDependencies: [ResolvedTarget.Dependency]
+                resolvedTargetDependencies: [ResolvedModule.Dependency]
             ) throws -> SwiftTargetBuildDescription {
                 let entryPointDerivedDir = buildParameters.buildPath.appending(components: "\(testProduct.name).derived")
                 let entryPointMainFileName = TestEntryPointTool.mainFileName(for: buildParameters.testingParameters.library)
@@ -124,7 +124,7 @@ extension BuildPlan {
                     packageAccess: true, // test target is allowed access to package decls
                     testEntryPointSources: entryPointSources
                 )
-                let entryPointResolvedTarget = ResolvedTarget(
+                let entryPointResolvedTarget = ResolvedModule(
                     packageIdentity: testProduct.packageIdentity,
                     underlying: entryPointTarget,
                     dependencies: testProduct.targets.map { .target($0, conditions: []) } + resolvedTargetDependencies,
@@ -144,9 +144,9 @@ extension BuildPlan {
                 )
             }
 
-            let discoveryTargets: (target: SwiftTarget, resolved: ResolvedTarget, buildDescription: SwiftTargetBuildDescription)?
+            let discoveryTargets: (target: SwiftTarget, resolved: ResolvedModule, buildDescription: SwiftTargetBuildDescription)?
             let swiftTargetDependencies: [Target.Dependency]
-            let resolvedTargetDependencies: [ResolvedTarget.Dependency]
+            let resolvedTargetDependencies: [ResolvedModule.Dependency]
 
             switch buildParameters.testingParameters.library {
             case .xctest:
@@ -169,7 +169,7 @@ extension BuildPlan {
                             packageAccess: entryPointResolvedTarget.packageAccess,
                             testEntryPointSources: entryPointResolvedTarget.underlying.sources
                         )
-                        let entryPointResolvedTarget = ResolvedTarget(
+                        let entryPointResolvedTarget = ResolvedModule(
                             packageIdentity: testProduct.packageIdentity,
                             underlying: entryPointTarget,
                             dependencies: entryPointResolvedTarget.dependencies + resolvedTargetDependencies,