Clean up variable naming, fix CMake filename mismatch

swiftlang · Nov 22, 2022 · 13ec06e · 13ec06e
1 parent ecd74b4
commit 13ec06e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/Sources/SPMBuildCore/CMakeLists.txt b/Sources/SPMBuildCore/CMakeLists.txt
@@ -14,7 +14,7 @@ add_library(SPMBuildCore
   BuildSystemCommand.swift
   BuildSystemDelegate.swift
   BuiltTestProduct.swift
-  CrossCompilationDestinations.swift
+  DestinationsBundle.swift
   PluginContextSerializer.swift
   PluginInvocation.swift
   PluginMessages.swift

diff --git a/Sources/SPMBuildCore/DestinationsBundle.swift b/Sources/SPMBuildCore/DestinationsBundle.swift
@@ -64,9 +64,9 @@ private extension ArtifactsArchiveMetadata {
         where artifactMetadata.type == .crossCompilationDestination {
             var variants = [DestinationsBundle.Variant]()
 
-            for variant in artifactMetadata.variants {
+            for variantMetadata in artifactMetadata.variants {
                 let destinationJSONPath = try bundlePath
-                    .appending(RelativePath(validating: variant.path))
+                    .appending(RelativePath(validating: variantMetadata.path))
                     .appending(component: "destination.json")
 
                 guard fileSystem.exists(destinationJSONPath) else {
@@ -88,7 +88,7 @@ private extension ArtifactsArchiveMetadata {
                         fromFile: destinationJSONPath, fileSystem: fileSystem
                     )
 
-                    variants.append(.init(metadata: variant, destination: destination))
+                    variants.append(.init(metadata: variantMetadata, destination: destination))
                 } catch {
                     observabilityScope.emit(
                         .warning(