Sendable

Author: swhitty

Sources/KeyValueDecoder.swift

@@ -36,7 +36,7 @@ import Foundation
 public final class KeyValueDecoder {
 
     /// Contextual user-provided information for use during encoding.
-    public var userInfo: [CodingUserInfoKey: Any]
+    public var userInfo: [CodingUserInfoKey: any Sendable]
 
     /// The strategy to use for decoding `nil`. Defaults to `Optional<Any>.none` which can be decoded to any optional type.
     public var nilDecodingStrategy: NilDecodingStrategy = .default
@@ -71,7 +71,7 @@ public final class KeyValueDecoder {
     /// Strategy used to decode nil values.
     public typealias NilDecodingStrategy = NilCodingStrategy
 
-    public enum IntDecodingStrategy {
+    public enum IntDecodingStrategy: Sendable {
         /// Decodes all number types with lossless conversion or throws error.
         case exact
 

Sources/KeyValueEncoder.swift

@@ -35,7 +35,7 @@ import Foundation
 public final class KeyValueEncoder {
 
     /// Contextual user-provided information for use during encoding.
-    public var userInfo: [CodingUserInfoKey: Any]
+    public var userInfo: [CodingUserInfoKey: any Sendable]
 
     /// The strategy to use for encoding `nil`. Defaults to `Optional<Any>.none` which can be cast to any optional type.
     public var nilEncodingStrategy: NilEncodingStrategy = .default
@@ -58,15 +58,15 @@ public final class KeyValueEncoder {
 }
 
 /// Strategy used to encode and decode nil values.
-public enum NilCodingStrategy {
+public enum NilCodingStrategy: Sendable {
     /// `nil` values are removed
     case removed
 
     /// `nil` values are substituted with a placeholder value
-    case placeholder(Any, isNull: (Any) -> Bool)
+    case placeholder(any Sendable, isNull: @Sendable (Any) -> Bool)
 
     /// `nil` values are substituted with `Optional<Any>.none`. Can be cast to any optional type.
-    public static var `default`: NilCodingStrategy { .placeholder(Optional<Any>.none as Any, isNull: isOptionalNone) }
+    public static var `default`: NilCodingStrategy { .placeholder(Optional<any Sendable>.none as any Sendable, isNull: isOptionalNone) }
 
     /// `nil` values are substituted with `"$null"` placeholder string. Compatible with `PropertyListEncoder`.
     public static var stringNull: NilCodingStrategy { .placeholder("$null", isNull: { ($0 as? String == "$null") }) }

Tests/KeyValueDecoderTests.swift

@@ -1005,7 +1005,7 @@ private extension KeyValueDecoder {
         }
 
         let decoder = KeyValueDecoder()
-        decoder.userInfo[.decoder] = proxy.decode(from:)
+        decoder.userInfo[.decoder] = proxy as any DecodingProxy
         _ = try decoder.decode(StubDecoder.self, from: value)
         return proxy.result!
     }
@@ -1020,7 +1020,7 @@ private extension KeyValueDecoder {
         }
 
         let decoder = KeyValueDecoder()
-        decoder.userInfo[.decoder] = proxy.decode(from:)
+        decoder.userInfo[.decoder] = proxy as any DecodingProxy
         _ = try decoder.decode(StubDecoder.self, from: value)
         return proxy.result!
     }
@@ -1036,9 +1036,13 @@ private extension CodingUserInfoKey {
     static let decoder = CodingUserInfoKey(rawValue: "decoder")!
 }
 
+private protocol DecodingProxy: Sendable {
+    func decode(from decoder: any Decoder) throws
+}
+
 private struct StubDecoder: Decodable {
 
-    final class Proxy<T> {
+    final class Proxy<T>: @unchecked Sendable, DecodingProxy {
         private let closure: (any Decoder) throws -> T
         private(set) var result: T?
 
@@ -1052,8 +1056,8 @@ private struct StubDecoder: Decodable {
     }
 
     init(from decoder: any Decoder) throws {
-        let closure = decoder.userInfo[.decoder] as! (any Decoder) throws -> Void
-        try closure(decoder)
+        let proxy = decoder.userInfo[.decoder] as! any DecodingProxy
+        try proxy.decode(from: decoder)
     }
 }