Skip to content

Commit 60ea91c

Browse files
author
David Ungar
committed
Make disabling incremental build message same as in legacy driver.
1 parent cf36366 commit 60ea91c

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Sources/SwiftDriver/Incremental Compilation/BuildRecordInfo.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ import SwiftOptions
146146
outOfDateBuildRecord = try BuildRecord(contents: contents)
147147
}
148148
catch {
149-
failed("incremental compilation could not read build record at \(buildRecordPath): \(error.localizedDescription).")
149+
failed("could not read build record at \(buildRecordPath): \(error.localizedDescription).")
150150
return nil
151151
}
152152
guard actualSwiftVersion == outOfDateBuildRecord.swiftVersion else {

Sources/SwiftDriver/Incremental Compilation/IncrementalCompilationState.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ extension Diagnostic.Message {
179179
)
180180
}
181181
fileprivate static func remark_incremental_compilation_disabled(because why: String) -> Diagnostic.Message {
182-
.remark("Incremental compilation has been disabled, because \(why)")
182+
.remark("Disabling incremental build: \(why)")
183183
}
184184
fileprivate static func remark_incremental_compilation(because why: String) -> Diagnostic.Message {
185185
.remark("Incremental compilation: \(why)")

Tests/SwiftDriverTests/IncrementalCompilationTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@ final class IncrementalCompilationTests: XCTestCase {
386386
// Leave off the part after the colon because it varies on Linux:
387387
// MacOS: The operation could not be completed. (TSCBasic.FileSystemError error 3.).
388388
// Linux: The operation couldn’t be completed. (TSCBasic.FileSystemError error 3.)
389-
"Incremental compilation has been disabled, because incremental compilation could not read build record",
389+
"Disabling incremental build: could not read build record at",
390390
"Found 2 batchable jobs",
391391
"Forming into 1 batch",
392392
"Adding {compile: main.swift} to batch 0",

0 commit comments

Comments
 (0)