Skip to content

Commit ebdd69a

Browse files
committed
cleanup
1 parent fe396d1 commit ebdd69a

File tree

2 files changed

+2
-6
lines changed

2 files changed

+2
-6
lines changed

Sources/PackageGraph/PackageGraph+Loading.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ extension PackageGraph {
5555
manifestMap[$0.identity]
5656
})
5757
let rootManifestNodes = root.packages.map { identity, package in
58-
// FIXME: use PackageIdentity.root?
5958
GraphLoadingNode(identity: identity,
6059
manifest: package.manifest,
6160
productFilter: .everything)
@@ -273,7 +272,6 @@ private func createResolvedPackages(
273272
dependencyLocation: dependencyLocation,
274273
otherDependencyURL: resolvedPackage.package.manifest.packageLocation,
275274
identity: dependencyIdentity)
276-
//let diagnosticLocation = PackageLocation.Local(name: package.name, packagePath: package.path)
277275
return diagnostics.emit(error, location: package.diagnosticLocation)
278276
}
279277
// check that the explicit package dependency name matches the package name.
@@ -367,9 +365,6 @@ private func createResolvedPackages(
367365
for packageBuilder in packageBuilders {
368366
let package = packageBuilder.package
369367

370-
// The diagnostics location for this package.
371-
//let diagnosticLocation = { PackageLocation.Local(name: package.name, packagePath: package.path) }
372-
373368
// Get all implicit system library dependencies in this package.
374369
let implicitSystemTargetDeps = packageBuilder.dependencies
375370
.flatMap({ $0.targets })

Sources/Workspace/Workspace.swift

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,8 @@ extension Workspace {
10981098
func computePackageURLs() -> (required: Set<PackageReference>, missing: Set<PackageReference>) {
10991099
let manifestsMap: [PackageIdentity: Manifest] = Dictionary(uniqueKeysWithValues:
11001100
self.root.packages.map { ($0.key, $0.value.manifest) } +
1101-
self.dependencies.map { ($0.dependency.packageIdentity, $0.manifest) }) // FIXME: use dependency identity
1101+
self.dependencies.map { ($0.dependency.packageIdentity, $0.manifest) }
1102+
)
11021103

11031104
var inputIdentities: Set<PackageReference> = []
11041105
let inputNodes: [GraphLoadingNode] = self.root.packages.map{ identity, package in

0 commit comments

Comments
 (0)