Skip to content

Commit 8672593

Browse files
authored
fix new warnings in very new Swift compilers (#172)
Motivation: Newer Swift compilers warn about implicitly tupling the payload of an enum case whilst pattern matching. Modification: Stop using implicit tupling. Result: No warnings on newer Swift compilers.
1 parent f70f8aa commit 8672593

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed

Tests/NIOHTTP2Tests/CompoundOutboundBufferTest.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ final class CompoundOutboundBufferTest: XCTestCase {
7070
var newFrames: [HTTP2Frame] = Array()
7171
XCTAssertEqual(buffer.streamClosed(1).count, 0)
7272

73-
while case .frame(let write) = buffer.nextFlushedWritableFrame(channelWritable: true) {
74-
newFrames.append(write.0)
75-
XCTAssertNil(write.1)
76-
buffer.streamCreated(write.0.streamID, initialWindowSize: 65535)
77-
XCTAssertEqual(buffer.streamClosed(write.0.streamID).count, 0)
73+
while case .frame(let frame, let promise) = buffer.nextFlushedWritableFrame(channelWritable: true) {
74+
newFrames.append(frame)
75+
XCTAssertNil(promise)
76+
buffer.streamCreated(frame.streamID, initialWindowSize: 65535)
77+
XCTAssertEqual(buffer.streamClosed(frame.streamID).count, 0)
7878
}
7979

8080
subsequentFrames.assertFramesMatch(newFrames)
@@ -349,17 +349,17 @@ final class CompoundOutboundBufferTest: XCTestCase {
349349
buffer.flushReceived()
350350

351351
// Now attempt to unbuffer the frames.
352-
guard case .frame(let firstFrame) = buffer.nextFlushedWritableFrame(channelWritable: true) else {
352+
guard case .frame(let firstFrame, _) = buffer.nextFlushedWritableFrame(channelWritable: true) else {
353353
XCTFail("Didn't get expected frame")
354354
return
355355
}
356-
firstFrame.0.assertFrameMatches(this: pingFrame)
356+
firstFrame.assertFrameMatches(this: pingFrame)
357357

358-
guard case .frame(let secondFrame) = buffer.nextFlushedWritableFrame(channelWritable: true) else {
358+
guard case .frame(let secondFrame, _) = buffer.nextFlushedWritableFrame(channelWritable: true) else {
359359
XCTFail("Didn't get expected frame")
360360
return
361361
}
362-
secondFrame.0.assertFrameMatches(this: dataFrame)
362+
secondFrame.assertFrameMatches(this: dataFrame)
363363
}
364364
}
365365

Tests/NIOHTTP2Tests/TestUtilities.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -491,26 +491,26 @@ extension HTTP2Frame {
491491
}
492492

493493
func assertAlternativeServiceFrameMatches(this frame: HTTP2Frame, file: StaticString = #file, line: UInt = #line) {
494-
guard case .alternativeService(let payload) = frame.payload else {
494+
guard case .alternativeService(let origin, let field) = frame.payload else {
495495
preconditionFailure("AltSvc frames can never match non-AltSvc frames.")
496496
}
497-
self.assertAlternativeServiceFrame(origin: payload.origin, field: payload.field, file: file, line: line)
497+
self.assertAlternativeServiceFrame(origin: origin, field: field, file: file, line: line)
498498
}
499499

500500
func assertAlternativeServiceFrame(origin: String?, field: ByteBuffer?, file: StaticString = #file, line: UInt = #line) {
501-
guard case .alternativeService(let actualPayload) = self.payload else {
501+
guard case .alternativeService(let actualOrigin, let actualField) = self.payload else {
502502
XCTFail("Expected ALTSVC frame, got \(self.payload) instead", file: file, line: line)
503503
return
504504
}
505505

506506
XCTAssertEqual(.rootStream, self.streamID, "ALTSVC frame must be on the root stream!, got \(self.streamID)!", file: file, line: line)
507507
XCTAssertEqual(origin,
508-
actualPayload.origin,
509-
"Non matching origins: expected \(String(describing: origin)), got \(String(describing: actualPayload.origin))",
508+
actualOrigin,
509+
"Non matching origins: expected \(String(describing: origin)), got \(String(describing: actualOrigin))",
510510
file: file, line: line)
511511
XCTAssertEqual(field,
512-
actualPayload.field,
513-
"Non matching field: expected \(String(describing: field)), got \(String(describing: actualPayload.field))",
512+
actualField,
513+
"Non matching field: expected \(String(describing: field)), got \(String(describing: actualField))",
514514
file: file, line: line)
515515
}
516516

0 commit comments

Comments
 (0)