Skip to content

Commit 126ced2

Browse files
authored
Revert "[BuildPlan] Make build descriptions identifiable just like Resolved{Product, Module}"
This reverts commit dc34427.
1 parent 46d5038 commit 126ced2

File tree

4 files changed

+0
-46
lines changed

4 files changed

+0
-46
lines changed

Sources/Build/BuildDescription/ClangModuleBuildDescription.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,6 @@ public final class ClangModuleBuildDescription {
4242
/// The build parameters.
4343
let buildParameters: BuildParameters
4444

45-
/// The destination for while this module is built.
46-
public var destination: BuildParameters.Destination {
47-
self.buildParameters.destination
48-
}
49-
5045
/// The build environment.
5146
var buildEnvironment: BuildEnvironment {
5247
buildParameters.buildEnvironment

Sources/Build/BuildDescription/ModuleBuildDescription.swift

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -121,15 +121,6 @@ public enum ModuleBuildDescription: SPMBuildCore.ModuleBuildDescription {
121121
}
122122
}
123123

124-
var destination: BuildParameters.Destination {
125-
switch self {
126-
case .swift(let buildDescription):
127-
buildDescription.destination
128-
case .clang(let buildDescription):
129-
buildDescription.destination
130-
}
131-
}
132-
133124
var toolsVersion: ToolsVersion {
134125
switch self {
135126
case .swift(let buildDescription):
@@ -148,14 +139,3 @@ public enum ModuleBuildDescription: SPMBuildCore.ModuleBuildDescription {
148139
}
149140
}
150141
}
151-
152-
extension ModuleBuildDescription: Identifiable {
153-
public struct ID: Hashable {
154-
let moduleID: ResolvedModule.ID
155-
let destination: BuildParameters.Destination
156-
}
157-
158-
public var id: ID {
159-
ID(moduleID: self.module.id, destination: self.destination)
160-
}
161-
}

Sources/Build/BuildDescription/ProductBuildDescription.swift

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
3737
/// The build parameters.
3838
public let buildParameters: BuildParameters
3939

40-
/// The destination for while this product is built.
41-
public var destination: BuildParameters.Destination {
42-
self.buildParameters.destination
43-
}
44-
4540
/// All object files to link into this product.
4641
///
4742
// Computed during build planning.
@@ -402,17 +397,6 @@ public final class ProductBuildDescription: SPMBuildCore.ProductBuildDescription
402397
}
403398
}
404399

405-
extension ProductBuildDescription: Identifiable {
406-
public struct ID: Hashable {
407-
let productID: ResolvedProduct.ID
408-
let destination: BuildParameters.Destination
409-
}
410-
411-
public var id: ID {
412-
ID(productID: self.product.id, destination: self.destination)
413-
}
414-
}
415-
416400
extension SortedArray where Element == AbsolutePath {
417401
public static func +=<S: Sequence>(lhs: inout SortedArray, rhs: S) where S.Iterator.Element == AbsolutePath {
418402
lhs.insert(contentsOf: rhs)

Sources/Build/BuildDescription/SwiftModuleBuildDescription.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,6 @@ public final class SwiftModuleBuildDescription {
4949
/// The build parameters for this target.
5050
let buildParameters: BuildParameters
5151

52-
/// The destination for while this module is built.
53-
public var destination: BuildParameters.Destination {
54-
self.buildParameters.destination
55-
}
56-
5752
/// The build parameters for the macro dependencies of this target.
5853
let macroBuildParameters: BuildParameters
5954

0 commit comments

Comments
 (0)