Skip to content

Commit 241ed07

Browse files
shahmishalshahmishal
authored
Merge pull request #1267 from apple/revert-1266-artem/ben/91820791-change-frontend-job-titles
2 parents 535334b + 77ce1f4 commit 241ed07

File tree

5 files changed

+42
-42
lines changed

5 files changed

+42
-42
lines changed

‎Sources/SwiftDriver/Jobs/Job.swift

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -173,86 +173,86 @@ extension Job : CustomStringConvertible {
173173

174174
switch kind {
175175
case .compile:
176-
return join("Compile \(moduleName)", displayInputs.first?.file.basename)
176+
return join("Compiling \(moduleName)", displayInputs.first?.file.basename)
177177

178178
case .mergeModule:
179-
return "Merge module \(moduleName)"
179+
return "Merging module \(moduleName)"
180180

181181
case .link:
182-
return "Link \(moduleName)"
182+
return "Linking \(moduleName)"
183183

184184
case .generateDSYM:
185-
return "Generate dSYM for module \(moduleName)"
185+
return "Generating dSYM for module \(moduleName)"
186186

187187
case .autolinkExtract:
188-
return "Extract autolink information for module \(moduleName)"
188+
return "Extracting autolink information for module \(moduleName)"
189189

190190
case .emitModule:
191-
return "Emit module for \(moduleName)"
191+
return "Emitting module for \(moduleName)"
192192

193193
case .compileModuleFromInterface:
194-
return "Compile Swift module \(moduleName)"
194+
return "Compiling Swift module \(moduleName)"
195195

196196
case .generatePCH:
197-
return join("Compile bridging header", displayInputs.first?.file.basename)
197+
return join("Compiling bridging header", displayInputs.first?.file.basename)
198198

199199
case .moduleWrap:
200-
return "Wrap Swift module \(moduleName)"
200+
return "Wrapping Swift module \(moduleName)"
201201

202202
case .generatePCM:
203-
return "Compile Clang module \(moduleName)"
203+
return "Compiling Clang module \(moduleName)"
204204

205205
case .dumpPCM:
206206
return join("Dump information about Clang module", displayInputs.first?.file.name)
207207

208208
case .interpret:
209-
return join("Interpret", displayInputs.first?.file.name)
209+
return join("Interpreting", displayInputs.first?.file.name)
210210

211211
case .repl:
212-
return "Execute Swift REPL"
212+
return "Executing Swift REPL"
213213

214214
case .verifyDebugInfo:
215-
return "Verify debug information for module \(moduleName)"
215+
return "Verifying debug information for module \(moduleName)"
216216

217217
case .printTargetInfo:
218-
return "Gather target information for module \(moduleName)"
218+
return "Gathering target information for module \(moduleName)"
219219

220220
case .versionRequest:
221-
return "Get Swift version information"
221+
return "Getting Swift version information"
222222

223223
case .help:
224224
return "Swift help"
225225

226226
case .backend:
227-
return join("Embed bitcode for \(moduleName)", displayInputs.first?.file.basename)
227+
return join("Embedding bitcode for \(moduleName)", displayInputs.first?.file.basename)
228228

229229
case .emitSupportedFeatures:
230-
return "Emit supported Swift compiler features"
230+
return "Emitting supported Swift compiler features"
231231

232232
case .scanDependencies:
233-
return "Scan dependencies for module \(moduleName)"
233+
return "Scanning dependencies for module \(moduleName)"
234234

235235
case .verifyModuleInterface:
236-
return join("Verify emitted module interface", displayInputs.first?.file.basename)
236+
return join("Verifying emitted module interface", displayInputs.first?.file.basename)
237237

238238
case .generateAPIBaseline:
239-
return "Generate API baseline file for module \(moduleName)"
239+
return "Generating API baseline file for module \(moduleName)"
240240

241241
case .generateABIBaseline:
242-
return "Generate ABI baseline file for module \(moduleName)"
242+
return "Generating ABI baseline file for module \(moduleName)"
243243

244244
case .compareAPIBaseline:
245-
return "Compare API of \(moduleName) to baseline"
245+
return "Comparing API of \(moduleName) to baseline"
246246

247247
case .compareABIBaseline:
248-
return "Compare ABI of \(moduleName) to baseline"
248+
return "Comparing ABI of \(moduleName) to baseline"
249249
}
250250
}
251251

252252
public var descriptionForLifecycle: String {
253253
switch kind {
254254
case .compile:
255-
return "Compile \(inputsGeneratingCode.map {$0.file.basename}.joined(separator: ", "))"
255+
return "Compiling \(inputsGeneratingCode.map {$0.file.basename}.joined(separator: ", "))"
256256
default:
257257
return description
258258
}

‎Tests/IncrementalTestFramework/CompiledSourceCollector.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ struct CompiledSourceCollector {
2525

2626
private func getCompiledBasenames(from d: Diagnostic) -> [String] {
2727
let dd = d.description
28-
guard let startOfSources = dd.range(of: "Starting Compile ")?.upperBound
28+
guard let startOfSources = dd.range(of: "Starting Compiling ")?.upperBound
2929
else {
3030
return []
3131
}

‎Tests/SwiftDriverTests/ExplicitModuleBuildTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ throws {
5353
TypedVirtualPath(file: clangModuleDetails.moduleMapPath.path,
5454
type: .clangModuleMap)
5555
XCTAssertEqual(job.kind, .generatePCM)
56-
XCTAssertEqual(job.description, "Compile Clang module \(moduleId.moduleName)")
56+
XCTAssertEqual(job.description, "Compiling Clang module \(moduleId.moduleName)")
5757
XCTAssertTrue(job.inputs.contains(moduleMapPath))
5858
case .swiftPrebuiltExternal(_):
5959
XCTFail("Unexpected prebuilt external module dependency found.")

‎Tests/SwiftDriverTests/IncrementalCompilationTests.swift

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1546,16 +1546,16 @@ extension DiagVerifiable {
15461546
"Dependency module \(dependencyModuleName) is older than input file"
15471547
}
15481548
@DiagsBuilder func startCompilingExplicitClangDependency(_ dependencyModuleName: String) -> [Diagnostic.Message] {
1549-
"Starting Compile Clang module \(dependencyModuleName)"
1549+
"Starting Compiling Clang module \(dependencyModuleName)"
15501550
}
15511551
@DiagsBuilder func finishCompilingExplicitClangDependency(_ dependencyModuleName: String) -> [Diagnostic.Message] {
1552-
"Finished Compile Clang module \(dependencyModuleName)"
1552+
"Finished Compiling Clang module \(dependencyModuleName)"
15531553
}
15541554
@DiagsBuilder func startCompilingExplicitSwiftDependency(_ dependencyModuleName: String) -> [Diagnostic.Message] {
1555-
"Starting Compile Swift module \(dependencyModuleName)"
1555+
"Starting Compiling Swift module \(dependencyModuleName)"
15561556
}
15571557
@DiagsBuilder func finishCompilingExplicitSwiftDependency(_ dependencyModuleName: String) -> [Diagnostic.Message] {
1558-
"Finished Compile Swift module \(dependencyModuleName)"
1558+
"Finished Compiling Swift module \(dependencyModuleName)"
15591559
}
15601560
@DiagsBuilder func compilingExplicitClangDependency(_ dependencyModuleName: String) -> [Diagnostic.Message] {
15611561
startCompilingExplicitClangDependency(dependencyModuleName)
@@ -1794,7 +1794,7 @@ extension DiagVerifiable {
17941794
}
17951795
@DiagsBuilder func skipped(_ inputs: [String]) -> [Diagnostic.Message] {
17961796
for input in inputs {
1797-
"Skipped Compile \(input).swift"
1797+
"Skipped Compiling \(input).swift"
17981798
}
17991799
}
18001800
@DiagsBuilder func skipped(_ inputs: String...) -> [Diagnostic.Message] {
@@ -1849,10 +1849,10 @@ extension DiagVerifiable {
18491849

18501850
// MARK: - compiling
18511851
@DiagsBuilder func starting(_ inputs: [String]) -> [Diagnostic.Message] {
1852-
"Starting Compile \(inputs.map{$0 + ".swift"}.joined(separator: ", "))"
1852+
"Starting Compiling \(inputs.map{$0 + ".swift"}.joined(separator: ", "))"
18531853
}
18541854
@DiagsBuilder func finished(_ inputs: [String]) -> [Diagnostic.Message] {
1855-
"Finished Compile \(inputs.map{$0 + ".swift"}.joined(separator: ", "))"
1855+
"Finished Compiling \(inputs.map{$0 + ".swift"}.joined(separator: ", "))"
18561856
}
18571857
@DiagsBuilder func compiling(_ inputs: [String]) -> [Diagnostic.Message] {
18581858
starting(inputs); finished(inputs)
@@ -1875,12 +1875,12 @@ extension DiagVerifiable {
18751875
@DiagsBuilder var schedulingPostCompileJobs: [Diagnostic.Message] {
18761876
"Incremental compilation: Scheduling all post-compile jobs because something was compiled"
18771877
}
1878-
@DiagsBuilder var startingLinking: [Diagnostic.Message] { "Starting Link theModule" }
1878+
@DiagsBuilder var startingLinking: [Diagnostic.Message] { "Starting Linking theModule" }
18791879

1880-
@DiagsBuilder var finishedLinking: [Diagnostic.Message] { "Finished Link theModule" }
1880+
@DiagsBuilder var finishedLinking: [Diagnostic.Message] { "Finished Linking theModule" }
18811881

18821882
@DiagsBuilder var skippingLinking: [Diagnostic.Message] {
1883-
"Incremental compilation: Skipping job: Link theModule; oldest output is current"
1883+
"Incremental compilation: Skipping job: Linking theModule; oldest output is current"
18841884
}
18851885
@DiagsBuilder var schedLinking: [Diagnostic.Message] { schedulingPostCompileJobs; linking }
18861886

‎Tests/SwiftDriverTests/NonincrementalCompilationTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -315,14 +315,14 @@ final class NonincrementalCompilationTests: XCTestCase {
315315
"-driver-show-incremental",
316316
],
317317
expecting: [
318-
.remark("Starting Compile main.swift"),
319-
.remark("Finished Compile main.swift"),
320-
.remark("Starting Compile other.swift"),
321-
.remark("Finished Compile other.swift"),
318+
.remark("Starting Compiling main.swift"),
319+
.remark("Finished Compiling main.swift"),
320+
.remark("Starting Compiling other.swift"),
321+
.remark("Finished Compiling other.swift"),
322322
],
323323
alsoExpectingWhenAutolinking: [
324-
.remark("Starting Extract autolink information for module theModule"),
325-
.remark("Finished Extract autolink information for module theModule"),
324+
.remark("Starting Extracting autolink information for module theModule"),
325+
.remark("Finished Extracting autolink information for module theModule"),
326326
])
327327

328328
}

0 commit comments

Comments
 (0)