Add Sendable conformance

PureSwift · Nov 14, 2024 · 253aef8 · 253aef8
1 parent 30ab6a6
commit 253aef8
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 23 deletions.
diff --git a/Sources/Socket/Socket.swift b/Sources/Socket/Socket.swift
@@ -140,7 +140,7 @@ public struct Socket: Sendable {
     }
 
     /// Listen for connections on a socket.
-    public func listen(backlog: Int = Self.maxSocketBacklog) async throws {
+    public func listen(backlog: Int = Self.maxBacklog) async throws {
         try await manager.listen(backlog: backlog, for: fileDescriptor)
     }
 
@@ -168,7 +168,7 @@ public struct Socket: Sendable {
 public extension Socket {
 
     /// Maximum queue length specifiable by listen.
-    static var maxSocketBacklog: Int {
+    static var maxBacklog: Int {
         Int(_SOMAXCONN)
     }
 }

diff --git a/Sources/Socket/SocketContinuation.swift b/Sources/Socket/SocketContinuation.swift
@@ -9,7 +9,7 @@ import Foundation
 import SystemPackage
 
 #if DEBUG
-internal struct SocketContinuation<T, E> where E: Error, T: Sendable {
+internal struct SocketContinuation<T, E>: Sendable where E: Error, T: Sendable {
 
     private let function: String
 

diff --git a/Sources/Socket/SocketManager.swift b/Sources/Socket/SocketManager.swift
@@ -80,7 +80,7 @@ public protocol SocketManager: AnyObject, Sendable {
 }
 
 /// Socket Manager Configuration
-public protocol SocketManagerConfiguration {
+public protocol SocketManagerConfiguration: Sendable {
 
     associatedtype Manager: SocketManager
 

diff --git a/Sources/Socket/System/FileChange.swift b/Sources/Socket/System/FileChange.swift
@@ -96,7 +96,7 @@ public extension SocketDescriptor {
 }
 
 @usableFromInline
-internal struct FileChangeID: RawRepresentable, Hashable, Codable {
+internal struct FileChangeID: RawRepresentable, Hashable, Codable, Sendable {
 
     /// The raw C file handle.
     @_alwaysEmitIntoClient

diff --git a/Sources/Socket/System/FileEvent.swift b/Sources/Socket/System/FileEvent.swift
@@ -3,7 +3,7 @@ import SystemPackage
 /// File Events bitmask
 @frozen
 // @available(macOS 10.16, iOS 14.0, watchOS 7.0, tvOS 14.0, *)
-public struct FileEvents: OptionSet, Hashable, Codable {
+public struct FileEvents: OptionSet, Hashable, Codable, Sendable {
 
     /// The raw C file events.
     @_alwaysEmitIntoClient

diff --git a/Sources/Socket/System/FileFlags.swift b/Sources/Socket/System/FileFlags.swift
@@ -11,7 +11,7 @@ public extension FileDescriptor {
 
     /// Options that specify behavior for file descriptors.
     @frozen
-    struct Flags: OptionSet, Hashable, Codable {
+    struct Flags: OptionSet, Hashable, Codable, Sendable {
 
         /// The raw C options.
         @_alwaysEmitIntoClient

diff --git a/Sources/Socket/System/InternetProtocol.swift b/Sources/Socket/System/InternetProtocol.swift
@@ -2,7 +2,7 @@ import SystemPackage
 
 /// Internet Protocol Address
 @frozen
-public enum IPAddress: Equatable, Hashable, Codable {
+public enum IPAddress: Equatable, Hashable, Codable, Sendable {
 
     /// IPv4
     case v4(IPv4Address)
@@ -58,7 +58,7 @@ extension IPAddress: CustomStringConvertible, CustomDebugStringConvertible {
 
 /// IPv4 Socket Address
 @frozen
-public struct IPv4Address: Equatable, Hashable, Codable {
+public struct IPv4Address: Equatable, Hashable, Codable, Sendable {
 
     @usableFromInline
     internal let bytes: CInterop.IPv4Address
@@ -128,7 +128,7 @@ extension IPv4Address: CustomStringConvertible, CustomDebugStringConvertible {
 
 /// IPv6 Socket Address
 @frozen
-public struct IPv6Address: Equatable, Hashable, Codable {
+public struct IPv6Address: Equatable, Hashable, Codable, Sendable {
 
     @usableFromInline
     internal let bytes: CInterop.IPv6Address

diff --git a/Sources/Socket/System/MessageFlags.swift b/Sources/Socket/System/MessageFlags.swift
@@ -1,7 +1,7 @@
 
 /// Message Flags
 @frozen
-public struct MessageFlags: OptionSet, Hashable, Codable {
+public struct MessageFlags: OptionSet, Hashable, Codable, Sendable {
 
   /// The raw C file permissions.
   @_alwaysEmitIntoClient

diff --git a/Sources/Socket/System/SocketAddressFamily.swift b/Sources/Socket/System/SocketAddressFamily.swift
@@ -1,7 +1,7 @@
 
 /// POSIX Socket Address Family
 @frozen
-public struct SocketAddressFamily: RawRepresentable, Hashable, Codable {
+public struct SocketAddressFamily: RawRepresentable, Hashable, Codable, Sendable {
 
   /// The raw socket address family identifier.
   @_alwaysEmitIntoClient

diff --git a/Sources/Socket/System/SocketFlags.swift b/Sources/Socket/System/SocketFlags.swift
@@ -3,7 +3,7 @@ import CSocket
 
 /// Flags when opening sockets.
 @frozen
-public struct SocketFlags: OptionSet, Hashable, Codable {
+public struct SocketFlags: OptionSet, Hashable, Codable, Sendable {
 
     /// The raw C file events.
     @_alwaysEmitIntoClient

diff --git a/Sources/Socket/System/SocketOption.swift b/Sources/Socket/System/SocketOption.swift
@@ -48,7 +48,7 @@ public extension GenericSocketOption {
 
     /// Enable socket debugging.
     @frozen
-    struct Debug: BooleanSocketOption, Equatable, Hashable, ExpressibleByBooleanLiteral {
+    struct Debug: BooleanSocketOption, Equatable, Hashable, ExpressibleByBooleanLiteral, Sendable {
 
         @_alwaysEmitIntoClient
         public static var id: GenericSocketOption { .debug }
@@ -63,7 +63,7 @@ public extension GenericSocketOption {
 
     /// Enable sending of keep-alive messages on connection-oriented sockets.
     @frozen
-    struct KeepAlive: BooleanSocketOption, Equatable, Hashable, ExpressibleByBooleanLiteral {
+    struct KeepAlive: BooleanSocketOption, Equatable, Hashable, ExpressibleByBooleanLiteral, Sendable {
 
         @_alwaysEmitIntoClient
         public static var id: GenericSocketOption { .keepAlive }
@@ -78,7 +78,7 @@ public extension GenericSocketOption {
 
     // Allow reuse of local addresses when binding.
     @frozen
-    struct ReuseAddress: BooleanSocketOption, Equatable, Hashable, ExpressibleByBooleanLiteral {
+    struct ReuseAddress: BooleanSocketOption, Equatable, Hashable, ExpressibleByBooleanLiteral, Sendable {
 
         @_alwaysEmitIntoClient
         public static var id: GenericSocketOption { .reuseAddress }

diff --git a/Sources/Socket/System/SocketOptionID.swift b/Sources/Socket/System/SocketOptionID.swift
@@ -10,7 +10,7 @@ public protocol SocketOptionID: RawRepresentable {
 }
 
 @frozen
-public struct GenericSocketOption: RawRepresentable, Equatable, Hashable, SocketOptionID {
+public struct GenericSocketOption: RawRepresentable, Equatable, Hashable, SocketOptionID, Sendable {
 
     @_alwaysEmitIntoClient
     public static var optionLevel: SocketOptionLevel { .default }

diff --git a/Sources/Socket/System/SocketOptionLevel.swift b/Sources/Socket/System/SocketOptionLevel.swift
@@ -1,7 +1,7 @@
 
 // POSIX Socket Option Level
 @frozen
-public struct SocketOptionLevel: RawRepresentable, Hashable, Codable {
+public struct SocketOptionLevel: RawRepresentable, Hashable, Codable, Sendable {
 
   /// The raw socket address family identifier.
   @_alwaysEmitIntoClient

diff --git a/Sources/Socket/System/SocketProtocol.swift b/Sources/Socket/System/SocketProtocol.swift
@@ -1,6 +1,6 @@
 
 /// POSIX Socket Protocol
-public protocol SocketProtocol: RawRepresentable {
+public protocol SocketProtocol: RawRepresentable, Sendable {
 
     static var family: SocketAddressFamily { get }
 

diff --git a/Sources/Socket/System/SocketType.swift b/Sources/Socket/System/SocketType.swift
@@ -1,11 +1,8 @@
-#if canImport(Darwin)
-import Darwin
-#endif
 import SystemPackage
 
 /// POSIX Socket Type
 @frozen
-public struct SocketType: RawRepresentable, Hashable, Codable {
+public struct SocketType: RawRepresentable, Hashable, Sendable {
 
   /// The raw socket type identifier.
   @_alwaysEmitIntoClient
@@ -24,6 +21,14 @@ public struct SocketType: RawRepresentable, Hashable, Codable {
   }
 }
 
+// MARK: - Codable
+
+#if !hasFeature(Embedded)
+extension SocketType: Codable { }
+#endif
+
+// MARK: - Constants
+
 public extension SocketType {
 
     /// Stream socket