Skip to content

Commit 09030ba

Browse files
committed
Fix a few warnings
Motivation: Swift 6.1 emits a few new warnings from Swift Testing Modifications: - Remove redundant `#require` macros - Enable warnings as errors in CI - Remove `-require-explicit-sendable` as it wasn't enabled correctly (it requires `-Xfrontend` and is currently incompatible with `-warnings-as-errors`) Result: Fewer warnings
1 parent a547cfe commit 09030ba

File tree

4 files changed

+15
-15
lines changed

4 files changed

+15
-15
lines changed

.github/workflows/main.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ jobs:
1313
with:
1414
linux_5_9_enabled: false
1515
linux_5_10_enabled: false
16-
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
17-
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
18-
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
19-
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
16+
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -warnings-as-errors"
17+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -warnings-as-errors"
18+
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
19+
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2020

2121
construct-plugin-tests-matrix:
2222
name: Construct plugin tests matrix

.github/workflows/pull_request.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
with:
2323
linux_5_9_enabled: false
2424
linux_5_10_enabled: false
25-
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
26-
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
27-
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
28-
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -require-explicit-sendable"
25+
linux_6_0_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -warnings-as-errors"
26+
linux_6_1_arguments_override: "--explicit-target-dependency-import-check error -Xswiftc -warnings-as-errors"
27+
linux_nightly_next_arguments_override: "--explicit-target-dependency-import-check error"
28+
linux_nightly_main_arguments_override: "--explicit-target-dependency-import-check error"
2929

3030
construct-plugin-tests-matrix:
3131
name: Construct plugin tests matrix

Tests/GRPCProtobufCodeGenTests/ProtobufCodeGenParserTests.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ struct ProtobufCodeGenParserTests {
3030
let codeGen: CodeGenerationRequest
3131

3232
init() throws {
33-
let descriptor = try #require(try Self.fileDescriptor)
33+
let descriptor = try Self.fileDescriptor
3434
self.codeGen = try parseDescriptor(descriptor)
3535
}
3636

@@ -73,7 +73,7 @@ struct ProtobufCodeGenParserTests {
7373
let service: GRPCCodeGen.ServiceDescriptor
7474

7575
init() throws {
76-
let request = try parseDescriptor(try #require(try TestService.fileDescriptor))
76+
let request = try parseDescriptor(try TestService.fileDescriptor)
7777
try #require(request.services.count == 1)
7878
self.service = try #require(request.services.first)
7979
}
@@ -91,7 +91,7 @@ struct ProtobufCodeGenParserTests {
9191
let bidiStreaming: GRPCCodeGen.MethodDescriptor
9292

9393
init() throws {
94-
let request = try parseDescriptor(try #require(try TestService.fileDescriptor))
94+
let request = try parseDescriptor(try TestService.fileDescriptor)
9595
#expect(request.services.count == 1)
9696
let service = try #require(request.services.first)
9797

@@ -158,7 +158,7 @@ struct ProtobufCodeGenParserTests {
158158
let codeGen: CodeGenerationRequest
159159

160160
init() throws {
161-
let descriptor = try #require(try Self.fileDescriptor)
161+
let descriptor = try Self.fileDescriptor
162162
self.codeGen = try parseDescriptor(descriptor)
163163
}
164164

@@ -215,7 +215,7 @@ struct ProtobufCodeGenParserTests {
215215
let service: GRPCCodeGen.ServiceDescriptor
216216

217217
init() throws {
218-
let descriptor = try #require(try Self.fileDescriptor)
218+
let descriptor = try Self.fileDescriptor
219219
self.codeGen = try parseDescriptor(descriptor)
220220
self.service = try #require(self.codeGen.services.first)
221221
}
@@ -234,7 +234,7 @@ struct ProtobufCodeGenParserTests {
234234
let codeGen: CodeGenerationRequest
235235

236236
init() throws {
237-
let descriptor = try #require(try Self.fileDescriptor)
237+
let descriptor = try Self.fileDescriptor
238238
self.codeGen = try parseDescriptor(descriptor)
239239
}
240240

Tests/GRPCProtobufCodeGenTests/Utilities.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ private func loadDescriptorSet(
6363
)
6464

6565
let url = try #require(maybeURL)
66-
let data = try #require(try Data(contentsOf: url))
66+
let data = try Data(contentsOf: url)
6767
let descriptorSet = try Google_Protobuf_FileDescriptorSet(serializedBytes: data)
6868
return DescriptorSet(proto: descriptorSet)
6969
}

0 commit comments

Comments
 (0)