Skip to content

Commit 9fb082f

Browse files
authored
Merge pull request #822 from ahoppen/fix-warning
Fix build warnings
2 parents 8cb684e + acc3c6c commit 9fb082f

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

Sources/SwiftFormat/PrettyPrint/TokenStreamCreator.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -2369,7 +2369,7 @@ fileprivate final class TokenStreamCreator: SyntaxVisitor {
23692369

23702370
override func visit(_ node: GenericParameterSyntax) -> SyntaxVisitorContinueKind {
23712371
before(node.firstToken(viewMode: .sourceAccurate), tokens: .open)
2372-
after(node.eachKeyword, tokens: .break)
2372+
after(node.specifier, tokens: .break)
23732373
after(node.colon, tokens: .break)
23742374
if let trailingComma = node.trailingComma {
23752375
after(trailingComma, tokens: .close, .break(.same))

Sources/generate-swift-format/FileGenerator.swift

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,10 @@ protocol FileGenerator {
1919
func write(into handle: FileHandle) throws
2020
}
2121

22+
private struct FailedToCreateFileError: Error {
23+
let url: URL
24+
}
25+
2226
extension FileGenerator {
2327
/// Generates a file at the given URL, overwriting it if it already exists.
2428
func generateFile(at url: URL) throws {
@@ -27,7 +31,9 @@ extension FileGenerator {
2731
try fm.removeItem(at: url)
2832
}
2933

30-
fm.createFile(atPath: url.path, contents: nil, attributes: nil)
34+
if !fm.createFile(atPath: url.path, contents: nil, attributes: nil) {
35+
throw FailedToCreateFileError(url: url)
36+
}
3137
let handle = try FileHandle(forWritingTo: url)
3238
defer { handle.closeFile() }
3339

Tests/swift-formatTests/Utilities/FileIteratorTests.swift

+6-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,12 @@ extension FileIteratorTests {
7070
let fileURL = tmpURL(path)
7171
try FileManager.default.createDirectory(
7272
at: fileURL.deletingLastPathComponent(), withIntermediateDirectories: true)
73-
FileManager.default.createFile(atPath: fileURL.path, contents: Data())
73+
struct FailedToCreateFileError: Error {
74+
let url: URL
75+
}
76+
if !FileManager.default.createFile(atPath: fileURL.path, contents: Data()) {
77+
throw FailedToCreateFileError(url: fileURL)
78+
}
7479
}
7580

7681
/// Create a symlink between files or directories in the test's temporary space.

0 commit comments

Comments
 (0)