@@ -49,8 +49,8 @@ final class ContainerProvider {
49
49
}
50
50
51
51
func removeCachedContainers( for packages: [ PackageReference ] ) {
52
- packages. forEach {
53
- self . containersCache [ $0 ] = nil
52
+ for package in packages {
53
+ self . containersCache [ package ] = nil
54
54
}
55
55
}
56
56
@@ -89,7 +89,10 @@ final class ContainerProvider {
89
89
self . underlying. getContainer (
90
90
for: package ,
91
91
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
+ ) ,
93
96
on: . sharedConcurrent
94
97
) { result in
95
98
let result = result. tryMap { container -> PubGrubPackageContainer in
@@ -106,7 +109,7 @@ final class ContainerProvider {
106
109
/// Starts prefetching the given containers.
107
110
func prefetch( containers identifiers: [ PackageReference ] , availableLibraries: [ LibraryMetadata ] ) {
108
111
let filteredIdentifiers = identifiers. filter {
109
- return $0. matchingPrebuiltLibrary ( in: availableLibraries) == nil
112
+ $0. matchingPrebuiltLibrary ( in: availableLibraries) == nil
110
113
}
111
114
// Process each container.
112
115
for identifier in filteredIdentifiers {
@@ -121,13 +124,19 @@ final class ContainerProvider {
121
124
self . underlying. getContainer (
122
125
for: identifier,
123
126
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
+ ) ,
125
131
on: . sharedConcurrent
126
132
) { result in
127
133
defer { self . prefetches [ identifier] ? . leave ( ) }
128
134
// only cache positive results
129
135
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
+ )
131
140
}
132
141
}
133
142
}
0 commit comments