From 13ec06e2e30e8a6a82bc4b572270f83c39132a0d Mon Sep 17 00:00:00 2001
From: Max Desiatov <m_desiatov@apple.com>
Date: Tue, 22 Nov 2022 10:51:38 +0000
Subject: [PATCH] Clean up variable naming, fix CMake filename mismatch

---
 Sources/SPMBuildCore/CMakeLists.txt           | 2 +-
 Sources/SPMBuildCore/DestinationsBundle.swift | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Sources/SPMBuildCore/CMakeLists.txt b/Sources/SPMBuildCore/CMakeLists.txt
index 75179ca76f1..e213f8b91bf 100644
--- 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
index f524308edfa..68c6c3972bc 100644
--- 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(