Skip to content

Commit a9622d0

Browse files
committed
Add annotations for Core and CFSocketRef
1 parent 1e8bd72 commit a9622d0

File tree

2 files changed

+8
-6
lines changed

2 files changed

+8
-6
lines changed

Sources/Foundation/Port.swift

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,6 +407,8 @@ fileprivate func __NSFireSocketDatagram(_ socket: CFSocket?, _ type: CFSocketCal
407407
@available(*, unavailable)
408408
extension SocketPort : @unchecked Sendable { }
409409

410+
extension CFSocket : @unchecked Sendable { }
411+
410412
open class SocketPort : Port {
411413
struct SocketKind: Hashable {
412414
var protocolFamily: Int32
@@ -474,7 +476,7 @@ open class SocketPort : Port {
474476
}
475477
}
476478

477-
class Core {
479+
class Core : @unchecked Sendable {
478480
fileprivate let isUniqued: Bool
479481
fileprivate var signature: Signature!
480482

Sources/Foundation/UserDefaults.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@_implementationOnly import CoreFoundation
1111
internal import Synchronization
1212

13-
private let registeredDefaults = Mutex<[String: Any]>([:])
13+
private let registeredDefaults = Mutex<[String: (Any & Sendable)]>([:])
1414
private nonisolated(unsafe) var sharedDefaults = UserDefaults() // the default one is thread safe, at least
1515

1616
fileprivate func bridgeFromNSCFTypeIfNeeded(_ value: Any) -> Any {
@@ -342,22 +342,22 @@ open class UserDefaults: NSObject {
342342
return _dictionaryRepresentation(includingVolatileDomains: true)
343343
}
344344

345-
private func _dictionaryRepresentation(includingVolatileDomains: Bool) -> [String: Any] {
345+
private func _dictionaryRepresentation(includingVolatileDomains: Bool) -> [String: (Any & Sendable)] {
346346
let registeredDefaultsIfAllowed = includingVolatileDomains ? registeredDefaults.withLock { $0 } : [:]
347347

348348
let defaultsFromDiskCF = CFPreferencesCopyMultiple(nil, suite?._cfObject ?? kCFPreferencesCurrentApplication, kCFPreferencesCurrentUser, kCFPreferencesAnyHost)
349-
let defaultsFromDiskWithNumbersBoxed = __SwiftValue.fetch(defaultsFromDiskCF) as? [String: Any] ?? [:]
349+
let defaultsFromDiskWithNumbersBoxed = __SwiftValue.fetch(defaultsFromDiskCF) as? [String: (Any & Sendable)] ?? [:]
350350

351351
if registeredDefaultsIfAllowed.isEmpty {
352-
return UserDefaults._unboxingNSNumbers(defaultsFromDiskWithNumbersBoxed) as! [String: Any]
352+
return UserDefaults._unboxingNSNumbers(defaultsFromDiskWithNumbersBoxed) as! [String: (Any & Sendable)]
353353
} else {
354354
var allDefaults = registeredDefaultsIfAllowed
355355

356356
for (key, value) in defaultsFromDiskWithNumbersBoxed {
357357
allDefaults[key] = value
358358
}
359359

360-
return UserDefaults._unboxingNSNumbers(allDefaults) as! [String: Any]
360+
return UserDefaults._unboxingNSNumbers(allDefaults) as! [String: (Any & Sendable)]
361361
}
362362
}
363363

0 commit comments

Comments
 (0)