From d0b2bc0f7169601fa04079196af4097de3285ebc Mon Sep 17 00:00:00 2001
From: Bartosz Polaczyk <polac24@gmail.com>
Date: Wed, 24 Nov 2021 21:49:30 +0100
Subject: [PATCH] Prereview cleanup

---
 Sources/XCRemoteCache/Commands/Swiftc/SwiftcContext.swift | 2 +-
 .../Plugins/Thinning/ThinningCreatorPluginTests.swift     | 8 ++++----
 .../Commands/SwiftcOrchestratorTests.swift                | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Sources/XCRemoteCache/Commands/Swiftc/SwiftcContext.swift b/Sources/XCRemoteCache/Commands/Swiftc/SwiftcContext.swift
index 80ef0cd..1e58ff4 100644
--- a/Sources/XCRemoteCache/Commands/Swiftc/SwiftcContext.swift
+++ b/Sources/XCRemoteCache/Commands/Swiftc/SwiftcContext.swift
@@ -24,7 +24,7 @@ public struct SwiftcContext {
         case producer
         /// Commit sha of the commit to use during remote cache
         case consumer(commit: RemoteCommitInfo)
-        /// Remote artifact exists and can be optimistically used in lieu of a local compilation
+        /// Remote artifact exists and can be optimistically used in place of a local compilation
         case producerFast
     }
 
diff --git a/Tests/XCRemoteCacheTests/Commands/Plugins/Thinning/ThinningCreatorPluginTests.swift b/Tests/XCRemoteCacheTests/Commands/Plugins/Thinning/ThinningCreatorPluginTests.swift
index 4be637b..8d2eae2 100644
--- a/Tests/XCRemoteCacheTests/Commands/Plugins/Thinning/ThinningCreatorPluginTests.swift
+++ b/Tests/XCRemoteCacheTests/Commands/Plugins/Thinning/ThinningCreatorPluginTests.swift
@@ -35,7 +35,7 @@ class ThinningCreatorPluginTests: FileXCTestCase {
         try fileManager.spt_createEmptyDir(currentTargetTempDir)
         plugin = ThinningCreatorPlugin(
             targetTempDir: currentTargetTempDir,
-            modeMarkerPath: "rc.enabled",
+            modeMarkerPath: "rc_marker.enabled",
             dirScanner: FileManager.default)
     }
 
@@ -79,7 +79,7 @@ class ThinningCreatorPluginTests: FileXCTestCase {
 
     func testDefinesExtraMetaKeysForTargetsThatReusedArtifact() throws {
         let otherTargetTempDir = targetTempDirRoot.appendingPathComponent("Other.build")
-        let marker = otherTargetTempDir.appendingPathComponent("rc.enabled")
+        let marker = otherTargetTempDir.appendingPathComponent("rc_marker.enabled")
         let reusedArtifact = otherTargetTempDir
             .appendingPathComponent("xccache")
             .appendingPathComponent("123")
@@ -94,7 +94,7 @@ class ThinningCreatorPluginTests: FileXCTestCase {
 
     func testFailsGeneratingExtraMetaKeysForTwoArtifactsInTargetTempDir() throws {
         let otherTargetTempDir = targetTempDirRoot.appendingPathComponent("Other.build")
-        let marker = otherTargetTempDir.appendingPathComponent("rc.enabled")
+        let marker = otherTargetTempDir.appendingPathComponent("rc_marker.enabled")
         let reusedArtifact1 = otherTargetTempDir
             .appendingPathComponent("xccache")
             .appendingPathComponent("001")
@@ -119,7 +119,7 @@ class ThinningCreatorPluginTests: FileXCTestCase {
             .appendingPathExtension("zip")
         try fileManager.spt_createEmptyFile(generatedArtifact)
         let reusedTargetTempDir = targetTempDirRoot.appendingPathComponent("Reused.build")
-        let marker = reusedTargetTempDir.appendingPathComponent("rc.enabled")
+        let marker = reusedTargetTempDir.appendingPathComponent("rc_marker.enabled")
         let reusedArtifact = reusedTargetTempDir
             .appendingPathComponent("xccache")
             .appendingPathComponent("999")
diff --git a/Tests/XCRemoteCacheTests/Commands/SwiftcOrchestratorTests.swift b/Tests/XCRemoteCacheTests/Commands/SwiftcOrchestratorTests.swift
index b16e2a5..67bb168 100644
--- a/Tests/XCRemoteCacheTests/Commands/SwiftcOrchestratorTests.swift
+++ b/Tests/XCRemoteCacheTests/Commands/SwiftcOrchestratorTests.swift
@@ -211,7 +211,7 @@ class SwiftcOrchestratorTests: XCTestCase {
         XCTAssertEqual(artifactBuilder.addedObjCHeaders, ["archTest": [objcHeaderURL]])
     }
 
-    func testSuccessedMockInProducerFastModeModeDoesntFillObjCHeader() throws {
+    func testSuccessedMockInProducerFastModeDoesntFillObjCHeader() throws {
         let swiftc = SwiftcMock(mockingResult: .success)
         let orchestrator = SwiftcOrchestrator(
             mode: .producerFast,