Skip to content

Make disabling incremental build message same as in legacy driver. #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2020
Merged

Make disabling incremental build message same as in legacy driver. #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Sources/SwiftDriver/Incremental Compilation/BuildRecordInfo.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ import SwiftOptions
outOfDateBuildRecord = try BuildRecord(contents: contents)
}
catch {
failed("incremental compilation could not read build record at \(buildRecordPath): \(error.localizedDescription).")
failed("could not read build record at \(buildRecordPath): \(error.localizedDescription).")
return nil
}
guard actualSwiftVersion == outOfDateBuildRecord.swiftVersion else {
Expand Down
2 changes: 1 addition & 1 deletion Sources/SwiftDriver/Incremental Compilation/IncrementalCompilationState.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ extension Diagnostic.Message {
)
}
fileprivate static func remark_incremental_compilation_disabled(because why: String) -> Diagnostic.Message {
.remark("Incremental compilation has been disabled, because \(why)")
.remark("Disabling incremental build: \(why)")
}
fileprivate static func remark_incremental_compilation(because why: String) -> Diagnostic.Message {
.remark("Incremental compilation: \(why)")
Expand Down
2 changes: 1 addition & 1 deletion Tests/SwiftDriverTests/IncrementalCompilationTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ final class IncrementalCompilationTests: XCTestCase {
// Leave off the part after the colon because it varies on Linux:
// MacOS: The operation could not be completed. (TSCBasic.FileSystemError error 3.).
// Linux: The operation couldn’t be completed. (TSCBasic.FileSystemError error 3.)
"Incremental compilation has been disabled, because incremental compilation could not read build record",
"Disabling incremental build: could not read build record at",
"Found 2 batchable jobs",
"Forming into 1 batch",
"Adding {compile: main.swift} to batch 0",
Expand Down