More formatting

Author: PeterAdams-A

Sources/NIOHPACK/HPACKHeader.swift

@@ -39,7 +39,7 @@ public struct HPACKHeaders: ExpressibleByDictionaryLiteral, Sendable {
 
     // see 8.1.2.2. Connection-Specific Header Fields in RFC 7540
     @usableFromInline
-    static let illegalHeaders: [String] = [
+    static let illegalNames: [String] = [
         "connection", "keep-alive", "proxy-connection",
         "transfer-encoding", "upgrade",
     ]
@@ -57,14 +57,14 @@ public struct HPACKHeaders: ExpressibleByDictionaryLiteral, Sendable {
             if connectionHeaderValue.count > Self.connectionHeaderValueArraySizeLimit {
                 var headersToRemove = Set(connectionHeaderValue)
                 // Since we have a set we can just merge in the illegal headers.
-                headersToRemove.formUnion(Self.illegalHeaders.lazy.map { $0[...] })
+                headersToRemove.formUnion(Self.illegalNames.lazy.map { $0[...] })
                 self.headers.removeAll { header in
                     headersToRemove.contains(header.name[...])
                 }
             } else {
                 self.headers.removeAll { header in
                     connectionHeaderValue.contains(header.name[...])
-                        || HPACKHeaders.illegalHeaders.contains(header.name)
+                        || HPACKHeaders.illegalNames.contains(header.name)
                 }
             }
         } else {

Sources/NIOHTTP2/HTTP2ToHTTP1Codec.swift

@@ -726,7 +726,9 @@ extension HTTPHeaders {
         var newHeaders: [(String, String)] = []
         newHeaders.reserveCapacity(responseHead.headers.count + 1)
         newHeaders.append((":status", String(responseHead.status.code)))
-        responseHead.headers.forEach { newHeaders.append(($0.name, $0.value)) }
+        for responseHeader in responseHead.headers {
+            newHeaders.append((responseHeader.name, responseHeader.value))
+        }
 
         self.init(newHeaders)
     }

Sources/NIOHTTP2PerformanceTester/Bench1Conn10kRequests.swift

@@ -55,7 +55,7 @@ func setupServer(group: EventLoopGroup) throws -> Channel {
 
         // Set the handlers that are applied to the accepted Channels
         .childChannelInitializer { channel in
-            return channel.configureHTTP2Pipeline(mode: .server) { streamChannel -> EventLoopFuture<Void> in
+            channel.configureHTTP2Pipeline(mode: .server) { streamChannel -> EventLoopFuture<Void> in
                 streamChannel.pipeline.addHandler(HTTP2FramePayloadToHTTP1ServerCodec()).flatMap {
                     () -> EventLoopFuture<Void> in
                     streamChannel.pipeline.addHandler(HTTP1TestServer())

Sources/NIOHTTP2PerformanceTester/HuffmanDecodingBenchmark.swift

@@ -56,7 +56,8 @@ extension HuffmanDecodingBenchmark: Benchmark {
         self.buffer.writeInteger(UInt8(0x10))  // Never indexed, non-indexed name
         self.buffer.encodeInteger(1, prefix: 7, prefixBits: 0x80)  // Name length, huffman encoded, 7-bit integer
         self.buffer.writeInteger(UInt8(0x97))  // Huffman encoded "f"
-        self.buffer.encodeInteger(UInt(self.testType.huffmanBytes.count), prefix: 7, prefixBits: 0x80)  // Value length, huffman encoded, 7-bit integer
+        // Value length, huffman encoded, 7-bit integer
+        self.buffer.encodeInteger(UInt(self.testType.huffmanBytes.count), prefix: 7, prefixBits: 0x80)
         self.buffer.writeBytes(self.testType.huffmanBytes)
 
         // Run a single iteration of the loop. This warms up the encoder and decoder and ensures all the pages are mapped.

Sources/NIOHTTP2PerformanceTester/HuffmanEncodingBenchmark.swift

@@ -56,7 +56,7 @@ extension HuffmanEncodingBenchmark: Benchmark {
 }
 
 extension String {
-    static let basicHuffmanString: String = {
+    static let basicHuffman: String = {
         var text =
             "Hello, world. I am a header value; I have Teh Texts. I am going on for quite a long time because I want to ensure that the encoded data buffer needs to be expanded to test out that code. I'll try some meta-characters too: \r\t\n ought to do it, no?"
         while text.count < 1024 * 128 {
@@ -65,7 +65,7 @@ extension String {
         return text
     }()
 
-    static let complexHuffmanString: String = {
+    static let complexHuffman: String = {
         var text = "午セイ谷高ぐふあト食71入ツエヘナ津県を類及オモ曜一購ごきわ致掲ぎぐず敗文輪へけり鯖審ヘ塊米卸呪おぴ。"
         while text.utf8.count < 128 * 1024 {
             text += text

Sources/NIOHTTP2PerformanceTester/main.swift

@@ -138,11 +138,11 @@ try measureAndPrint(
 )
 try measureAndPrint(
     desc: "huffman_encode_basic",
-    benchmark: HuffmanEncodingBenchmark(huffmanString: .basicHuffmanString, loopCount: 100)
+    benchmark: HuffmanEncodingBenchmark(huffmanString: .basicHuffman, loopCount: 100)
 )
 try measureAndPrint(
     desc: "huffman_encode_complex",
-    benchmark: HuffmanEncodingBenchmark(huffmanString: .complexHuffmanString, loopCount: 100)
+    benchmark: HuffmanEncodingBenchmark(huffmanString: .complexHuffman, loopCount: 100)
 )
 try measureAndPrint(
     desc: "huffman_decode_basic",

Tests/NIOHTTP2Tests/ConcurrentStreamBufferTest.swift

@@ -232,23 +232,20 @@ final class ConcurrentStreamBufferTests: XCTestCase {
         )
         manager.streamCreated(1)
 
-        XCTAssertNoThrow(
-            try (0..<15).forEach { _ in
-                XCTAssertNoThrow(
-                    try manager.processOutboundFrame(subsequentFrame, promise: nil, channelWritable: true)
-                        .assertNothing()
-                )
-            }
-        )
+
+        for _ in 0..<15 {
+            XCTAssertNoThrow(
+                try manager.processOutboundFrame(subsequentFrame, promise: nil, channelWritable: true)
+                    .assertNothing()
+            )
+        }
         manager.flushReceived()
-        XCTAssertNoThrow(
-            try (0..<15).forEach { _ in
-                XCTAssertNoThrow(
-                    try manager.processOutboundFrame(subsequentFrame, promise: nil, channelWritable: true)
-                        .assertNothing()
-                )
-            }
-        )
+        for _ in 0..<15 {
+            XCTAssertNoThrow(
+                try manager.processOutboundFrame(subsequentFrame, promise: nil, channelWritable: true)
+                    .assertNothing()
+            )
+        }
 
         XCTAssertNil(manager.nextFlushedWritableFrame())