Merge branch 'main' into mmbm-shared-benchmark-ci

vapor · Jan 16, 2025 · c2e0e5d · c2e0e5d
2 parents 4ea418c + 48c1058
commit c2e0e5d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 5 deletions.
diff --git a/Benchmarks/Parser/AsyncSyncSequence.swift b/Benchmarks/Parser/AsyncSyncSequence.swift
@@ -31,7 +31,7 @@ final class AsyncSyncSequence<Base: Sequence>: AsyncSequence {
     }
 
     func makeAsyncIterator() -> Iterator {
-        defer { self.base = nil } // release the reference so no CoW is triggered
+        defer { self.base = nil }  // release the reference so no CoW is triggered
         return Iterator(base.unsafelyUnwrapped.makeIterator())
     }
 }
diff --git a/Sources/MultipartKit/MultipartFormData.swift b/Sources/MultipartKit/MultipartFormData.swift
@@ -1,7 +1,7 @@
 import Collections
 import Foundation
 
-enum MultipartFormData<Body: MultipartPartBodyElement>: Equatable, Sendable {
+enum MultipartFormData<Body: MultipartPartBodyElement>: Sendable {
     typealias Keyed = OrderedDictionary<String, MultipartFormData>
 
     case single(MultipartPart<Body>)

diff --git a/Sources/MultipartKit/MultipartPart.swift b/Sources/MultipartKit/MultipartPart.swift
@@ -1,9 +1,9 @@
 import HTTPTypes
 
-public typealias MultipartPartBodyElement = Collection<UInt8> & Equatable & Sendable
+public typealias MultipartPartBodyElement = Collection<UInt8> & Sendable
 
 /// Represents a single part of a multipart-encoded message.
-public struct MultipartPart<Body: MultipartPartBodyElement>: Equatable, Sendable {
+public struct MultipartPart<Body: MultipartPartBodyElement>: Sendable {
     /// The header fields for this part.
     public var headerFields: HTTPFields
 

diff --git a/Sources/MultipartKit/MultipartSection.swift b/Sources/MultipartKit/MultipartSection.swift
@@ -1,6 +1,6 @@
 import HTTPTypes
 
-public enum MultipartSection<Body: MultipartPartBodyElement>: Equatable, Sendable {
+public enum MultipartSection<Body: MultipartPartBodyElement>: Sendable {
     case headerFields(HTTPFields)
     case bodyChunk(Body)
     case boundary(end: Bool)

diff --git a/Tests/MultipartKitTests/Utilities/MultipartSection+Equatable.swift b/Tests/MultipartKitTests/Utilities/MultipartSection+Equatable.swift
@@ -0,0 +1,16 @@
+import MultipartKit
+
+extension MultipartSection: Equatable where Body: Equatable {
+    public static func == (lhs: MultipartKit.MultipartSection<Body>, rhs: MultipartKit.MultipartSection<Body>) -> Bool {
+        switch (lhs, rhs) {
+        case let (.headerFields(lhsFields), .headerFields(rhsFields)):
+            lhsFields == rhsFields
+        case let (.bodyChunk(lhsChunk), .bodyChunk(rhsChunk)):
+            lhsChunk == rhsChunk
+        case (.boundary, .boundary):
+            true
+        default:
+            false
+        }
+    }
+}