Skip to content

Commit 2f48249

Browse files
committed
[PubGrub] NFC: Run swiftformat on all modified files
1 parent b817df1 commit 2f48249

File tree

5 files changed

+977
-593
lines changed

5 files changed

+977
-593
lines changed

Sources/PackageGraph/Resolution/PubGrub/ContainerProvider.swift

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ final class ContainerProvider {
4949
}
5050

5151
func removeCachedContainers(for packages: [PackageReference]) {
52-
packages.forEach {
53-
self.containersCache[$0] = nil
52+
for package in packages {
53+
self.containersCache[package] = nil
5454
}
5555
}
5656

@@ -89,7 +89,10 @@ final class ContainerProvider {
8989
self.underlying.getContainer(
9090
for: package,
9191
updateStrategy: self.skipUpdate ? .never : .always, // TODO: make this more elaborate
92-
observabilityScope: self.observabilityScope.makeChildScope(description: "getting package container", metadata: package.diagnosticsMetadata),
92+
observabilityScope: self.observabilityScope.makeChildScope(
93+
description: "getting package container",
94+
metadata: package.diagnosticsMetadata
95+
),
9396
on: .sharedConcurrent
9497
) { result in
9598
let result = result.tryMap { container -> PubGrubPackageContainer in
@@ -106,7 +109,7 @@ final class ContainerProvider {
106109
/// Starts prefetching the given containers.
107110
func prefetch(containers identifiers: [PackageReference], availableLibraries: [LibraryMetadata]) {
108111
let filteredIdentifiers = identifiers.filter {
109-
return $0.matchingPrebuiltLibrary(in: availableLibraries) == nil
112+
$0.matchingPrebuiltLibrary(in: availableLibraries) == nil
110113
}
111114
// Process each container.
112115
for identifier in filteredIdentifiers {
@@ -121,13 +124,19 @@ final class ContainerProvider {
121124
self.underlying.getContainer(
122125
for: identifier,
123126
updateStrategy: self.skipUpdate ? .never : .always, // TODO: make this more elaborate
124-
observabilityScope: self.observabilityScope.makeChildScope(description: "prefetching package container", metadata: identifier.diagnosticsMetadata),
127+
observabilityScope: self.observabilityScope.makeChildScope(
128+
description: "prefetching package container",
129+
metadata: identifier.diagnosticsMetadata
130+
),
125131
on: .sharedConcurrent
126132
) { result in
127133
defer { self.prefetches[identifier]?.leave() }
128134
// only cache positive results
129135
if case .success(let container) = result {
130-
self.containersCache[identifier] = PubGrubPackageContainer(underlying: container, pins: self.pins)
136+
self.containersCache[identifier] = PubGrubPackageContainer(
137+
underlying: container,
138+
pins: self.pins
139+
)
131140
}
132141
}
133142
}

0 commit comments

Comments
 (0)