Merge pull request swiftlang#1068 from apple/revert-1065-ben/91820791-change-frontend-job-titles

Revert "Change description for lifecycle"

Author: shahmishal

Sources/SwiftDriver/Jobs/Job.swift

@@ -172,83 +172,83 @@ extension Job : CustomStringConvertible {
 
     switch kind {
     case .compile:
-        return join("Compile \(moduleName)", displayInputs.first?.file.basename)
+        return join("Compiling \(moduleName)", displayInputs.first?.file.basename)
 
     case .mergeModule:
-        return "Merge module \(moduleName)"
+        return "Merging module \(moduleName)"
 
     case .link:
-        return "Link \(moduleName)"
+        return "Linking \(moduleName)"
 
     case .generateDSYM:
-        return "Generate dSYM for module \(moduleName)"
+        return "Generating dSYM for module \(moduleName)"
 
     case .autolinkExtract:
-        return "Extract autolink information for module \(moduleName)"
+        return "Extracting autolink information for module \(moduleName)"
 
     case .emitModule:
-        return "Emit module for \(moduleName)"
+        return "Emitting module for \(moduleName)"
 
     case .generatePCH:
-        return join("Compile bridging header", displayInputs.first?.file.basename)
+        return join("Compiling bridging header", displayInputs.first?.file.basename)
 
     case .moduleWrap:
-      return "Wrap Swift module \(moduleName)"
+      return "Wrapping Swift module \(moduleName)"
 
     case .generatePCM:
-        return "Compile Clang module \(moduleName)"
+        return "Compiling Clang module \(moduleName)"
 
     case .dumpPCM:
         return join("Dump information about Clang module", displayInputs.first?.file.name)
 
     case .interpret:
-        return join("Interpret", displayInputs.first?.file.name)
+        return join("Interpreting", displayInputs.first?.file.name)
 
     case .repl:
-        return "Execute Swift REPL"
+        return "Executing Swift REPL"
 
     case .verifyDebugInfo:
-        return "Verify debug information for module \(moduleName)"
+        return "Verifying debug information for module \(moduleName)"
 
     case .printTargetInfo:
-        return "Gather target information for module \(moduleName)"
+        return "Gathering target information for module \(moduleName)"
 
     case .versionRequest:
-        return "Get Swift version information"
+        return "Getting Swift version information"
 
     case .help:
         return "Swift help"
 
     case .backend:
-      return join("Embed bitcode for \(moduleName)", displayInputs.first?.file.basename)
+      return join("Embedding bitcode for \(moduleName)", displayInputs.first?.file.basename)
 
     case .emitSupportedFeatures:
-      return "Emit supported Swift compiler features"
+      return "Emitting supported Swift compiler features"
 
     case .scanDependencies:
-      return "Scan dependencies for module \(moduleName)"
+      return "Scanning dependencies for module \(moduleName)"
 
     case .verifyModuleInterface:
-      return "Verify emitted module interface for module \(moduleName)"
+      return "Verifying emitted module interface for module \(moduleName)"
 
     case .generateAPIBaseline:
-      return "Generate API baseline file for module \(moduleName)"
+      return "Generating API baseline file for module \(moduleName)"
 
     case .generateABIBaseline:
-      return "Generate ABI baseline file for module \(moduleName)"
+      return "Generating ABI baseline file for module \(moduleName)"
 
     case .compareAPIBaseline:
-      return "Compare API of \(moduleName) to baseline"
+      return "Comparing API of \(moduleName) to baseline"
 
     case .compareABIBaseline:
-      return "Compare ABI of \(moduleName) to baseline"
+      return "Comparing ABI of \(moduleName) to baseline"
     }
   }
 
   public var descriptionForLifecycle: String {
     switch kind {
     case .compile:
-      return "Compile \(inputsGeneratingCode.map {$0.file.basename}.joined(separator: ", "))"
+      return "Compiling \(inputsGeneratingCode.map {$0.file.basename}.joined(separator: ", "))"
     default:
       return description
     }

Tests/IncrementalTestFramework/CompiledSourceCollector.swift

@@ -25,7 +25,7 @@ struct CompiledSourceCollector {
 
   private func getCompiledBasenames(from d: Diagnostic) -> [String] {
     let dd = d.description
-    guard let startOfSources = dd.range(of: "Starting Compile ")?.upperBound
+    guard let startOfSources = dd.range(of: "Starting Compiling ")?.upperBound
     else {
       return []
     }

Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

@@ -56,7 +56,7 @@ throws {
         TypedVirtualPath(file: clangModuleDetails.moduleMapPath.path,
                          type: .clangModuleMap)
       XCTAssertEqual(job.kind, .generatePCM)
-      XCTAssertEqual(job.description, "Compile Clang module \(moduleId.moduleName)")
+      XCTAssertEqual(job.description, "Compiling Clang module \(moduleId.moduleName)")
       XCTAssertTrue(job.inputs.contains(moduleMapPath))
     case .swiftPrebuiltExternal(_):
       XCTFail("Unexpected prebuilt external module dependency found.")

Tests/SwiftDriverTests/IncrementalCompilationTests.swift

@@ -1570,7 +1570,7 @@ extension DiagVerifiable {
   }
   @DiagsBuilder func skipped(_ inputs: [String]) -> [Diagnostic.Message] {
     for input in inputs {
-      "Skipped Compile \(input).swift"
+      "Skipped Compiling \(input).swift"
     }
   }
   @DiagsBuilder func skipped(_ inputs: String...) -> [Diagnostic.Message] {
@@ -1625,10 +1625,10 @@ extension DiagVerifiable {
 
   // MARK: - compiling
   @DiagsBuilder func starting(_ inputs: [String]) -> [Diagnostic.Message] {
-     "Starting Compile \(inputs.map{$0 + ".swift"}.joined(separator: ", "))"
+     "Starting Compiling \(inputs.map{$0 + ".swift"}.joined(separator: ", "))"
   }
   @DiagsBuilder func finished(_ inputs: [String]) -> [Diagnostic.Message] {
-     "Finished Compile \(inputs.map{$0 + ".swift"}.joined(separator: ", "))"
+     "Finished Compiling \(inputs.map{$0 + ".swift"}.joined(separator: ", "))"
   }
   @DiagsBuilder func compiling(_ inputs: [String]) -> [Diagnostic.Message] {
     starting(inputs); finished(inputs)
@@ -1651,12 +1651,12 @@ extension DiagVerifiable {
   @DiagsBuilder var schedulingPostCompileJobs: [Diagnostic.Message] {
     "Incremental compilation: Scheduling all post-compile jobs because something was compiled"
   }
-  @DiagsBuilder var startingLinking: [Diagnostic.Message] { "Starting Link theModule" }
+  @DiagsBuilder var startingLinking: [Diagnostic.Message] { "Starting Linking theModule" }
 
-  @DiagsBuilder var finishedLinking: [Diagnostic.Message] { "Finished Link theModule" }
+  @DiagsBuilder var finishedLinking: [Diagnostic.Message] { "Finished Linking theModule" }
 
   @DiagsBuilder var skippingLinking: [Diagnostic.Message] {
-    "Incremental compilation: Skipping job: Link theModule; oldest output is current"
+    "Incremental compilation: Skipping job: Linking theModule; oldest output is current"
   }
   @DiagsBuilder var schedLinking: [Diagnostic.Message] { schedulingPostCompileJobs; linking }
 

Tests/SwiftDriverTests/NonincrementalCompilationTests.swift

@@ -319,14 +319,14 @@ final class NonincrementalCompilationTests: XCTestCase {
       "-driver-show-incremental",
     ],
     expecting: [
-      .remark("Starting Compile main.swift"),
-      .remark("Finished Compile main.swift"),
-      .remark("Starting Compile other.swift"),
-      .remark("Finished Compile other.swift"),
+      .remark("Starting Compiling main.swift"),
+      .remark("Finished Compiling main.swift"),
+      .remark("Starting Compiling other.swift"),
+      .remark("Finished Compiling other.swift"),
     ],
     alsoExpectingWhenAutolinking: [
-      .remark("Starting Extract autolink information for module theModule"),
-      .remark("Finished Extract autolink information for module theModule"),
+      .remark("Starting Extracting autolink information for module theModule"),
+      .remark("Finished Extracting autolink information for module theModule"),
     ])
 
   }