Skip to content

Commit 203ed95

Browse files
parkeraparkera
committed
Adapt to some changes in how unchecked Sendable conformance is declared
1 parent ef2ec14 commit 203ed95

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+102
-169
lines changed

‎Sources/Foundation/AffineTransform.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ public struct NSAffineTransformStruct : Sendable {
413413
}
414414

415415
@available(*, unavailable)
416-
extension NSAffineTransform : Sendable { }
416+
extension NSAffineTransform : @unchecked Sendable { }
417417

418418
open class NSAffineTransform: NSObject {
419419
// Internal only for testing.

‎Sources/Foundation/ByteCountFormatter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ extension ByteCountFormatter {
4040
}
4141

4242
@available(*, unavailable)
43-
extension ByteCountFormatter : Sendable { }
43+
extension ByteCountFormatter : @unchecked Sendable { }
4444

4545
open class ByteCountFormatter : Formatter {
4646
public override init() {

‎Sources/Foundation/CharacterSet.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ private func _utfRangeToNSRange(_ inRange : ClosedRange<UnicodeScalar>) -> NSRan
1818
return NSRange(location: Int(inRange.lowerBound.value), length: Int(inRange.upperBound.value - inRange.lowerBound.value + 1))
1919
}
2020

21-
internal final class _SwiftNSCharacterSet : NSCharacterSet, _SwiftNativeFoundationType, @unchecked Sendable {
21+
internal final class _SwiftNSCharacterSet : NSCharacterSet, _SwiftNativeFoundationType {
2222
internal typealias ImmutableType = NSCharacterSet
2323
internal typealias MutableType = NSMutableCharacterSet
2424

@@ -114,7 +114,7 @@ public struct CharacterSet : ReferenceConvertible, Equatable, Hashable, SetAlgeb
114114
internal typealias ImmutableType = SwiftNSWrapping.ImmutableType
115115
internal typealias MutableType = SwiftNSWrapping.MutableType
116116

117-
internal var _wrapped : _SwiftNSCharacterSet
117+
internal nonisolated(unsafe) var _wrapped : _SwiftNSCharacterSet
118118

119119
// MARK: Init methods
120120

‎Sources/Foundation/DispatchData+DataProtocol.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import Dispatch
1515

1616
@available(*, unavailable)
17-
extension DispatchData.Region : Sendable { }
17+
extension DispatchData.Region : @unchecked Sendable { }
1818

1919
extension DispatchData : DataProtocol {
2020
public typealias Regions = [Region]

‎Sources/Foundation/EnergyFormatter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ extension EnergyFormatter {
6161
}
6262

6363
@available(*, unavailable)
64-
extension EnergyFormatter : Sendable { }
64+
extension EnergyFormatter : @unchecked Sendable { }
6565

6666
open class EnergyFormatter: Formatter {
6767

‎Sources/Foundation/FileManager.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -608,12 +608,6 @@ extension FileAttributeKey {
608608
internal static let _accessDate = FileAttributeKey(rawValue: "org.swift.Foundation.FileAttributeKey._accessDate")
609609
}
610610

611-
@available(*, unavailable)
612-
extension FileManager.DirectoryEnumerator : Sendable { }
613-
614-
@available(*, unavailable)
615-
extension FileManager.NSPathDirectoryEnumerator : Sendable { }
616-
617611
extension FileManager {
618612
open class DirectoryEnumerator : NSEnumerator {
619613

‎Sources/Foundation/Formatter.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,7 @@ extension Formatter {
4343
}
4444
}
4545

46-
@available(*, unavailable)
47-
extension Formatter : Sendable { }
48-
46+
//@_nonSendable
4947
open class Formatter : NSObject, NSCopying, NSCoding {
5048

5149
public override init() {

‎Sources/Foundation/Host.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import WinSDK
5656
#endif
5757

5858
@available(*, unavailable)
59-
extension Host : Sendable { }
59+
extension Host : @unchecked Sendable { }
6060

6161
open class Host: NSObject {
6262
enum ResolveType {

‎Sources/Foundation/ISO8601DateFormatter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ extension ISO8601DateFormatter {
4949
}
5050

5151
@available(*, unavailable)
52-
extension ISO8601DateFormatter : Sendable { }
52+
extension ISO8601DateFormatter : @unchecked Sendable { }
5353

5454
open class ISO8601DateFormatter : Formatter, NSSecureCoding {
5555

‎Sources/Foundation/JSONSerialization.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ extension JSONSerialization {
5454
*/
5555

5656
@available(*, unavailable)
57-
extension JSONSerialization : Sendable { }
57+
extension JSONSerialization : @unchecked Sendable { }
5858

5959
open class JSONSerialization : NSObject {
6060

‎Sources/Foundation/LengthFormatter.swift

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ extension LengthFormatter {
2121
}
2222

2323
@available(*, unavailable)
24-
extension LengthFormatter : Sendable { }
24+
extension LengthFormatter : @unchecked Sendable { }
2525

2626
open class LengthFormatter : Formatter {
2727

@@ -57,11 +57,20 @@ open class LengthFormatter : Formatter {
5757

5858
// Format a number in meters to a localized string with the locale-appropriate unit and an appropriate scale (e.g. 4.3m = 14.1ft in the US locale).
5959
open func string(fromMeters numberInMeters: Double) -> String {
60+
let unitLength: [Unit:UnitLength] = [.millimeter:.millimeters,
61+
.centimeter:.centimeters,
62+
.meter:.meters,
63+
.kilometer:.kilometers,
64+
.inch:.inches,
65+
.foot:.feet,
66+
.yard:.yards,
67+
.mile:.miles]
68+
6069
//Convert to the locale-appropriate unit
6170
let unitFromMeters = unit(fromMeters: numberInMeters)
6271

6372
//Map the unit to UnitLength type for conversion later
64-
let unitLengthFromMeters = LengthFormatter.unitLength[unitFromMeters]!
73+
let unitLengthFromMeters = unitLength[unitFromMeters]!
6574

6675
//Create a measurement object based on the value in meters
6776
let meterMeasurement = Measurement<UnitLength>(value:numberInMeters, unit: .meters)
@@ -99,13 +108,21 @@ open class LengthFormatter : Formatter {
99108

100109
// Return the locale-appropriate unit, the same unit used by -stringFromMeters:.
101110
open func unitString(fromMeters numberInMeters: Double, usedUnit unitp: UnsafeMutablePointer<Unit>?) -> String {
111+
let unitLength: [Unit:UnitLength] = [.millimeter:.millimeters,
112+
.centimeter:.centimeters,
113+
.meter:.meters,
114+
.kilometer:.kilometers,
115+
.inch:.inches,
116+
.foot:.feet,
117+
.yard:.yards,
118+
.mile:.miles]
102119

103120
//Convert to the locale-appropriate unit
104121
let unitFromMeters = unit(fromMeters: numberInMeters)
105122
unitp?.pointee = unitFromMeters
106123

107124
//Map the unit to UnitLength type for conversion later
108-
let unitLengthFromMeters = LengthFormatter.unitLength[unitFromMeters]!
125+
let unitLengthFromMeters = unitLength[unitFromMeters]!
109126

110127
//Create a measurement object based on the value in meters
111128
let meterMeasurement = Measurement<UnitLength>(value:numberInMeters, unit: .meters)
@@ -155,16 +172,6 @@ open class LengthFormatter : Formatter {
155172
}
156173
}
157174

158-
/// Maps LengthFormatter.Unit enum to UnitLength class. Used for measurement conversion.
159-
private static let unitLength: [Unit:UnitLength] = [.millimeter:.millimeters,
160-
.centimeter:.centimeters,
161-
.meter:.meters,
162-
.kilometer:.kilometers,
163-
.inch:.inches,
164-
.foot:.feet,
165-
.yard:.yards,
166-
.mile:.miles]
167-
168175
/// Maps a unit to its short symbol. Reuses strings from UnitLength wherever possible.
169176
private static let shortSymbol: [Unit: String] = [.millimeter:UnitLength.millimeters.symbol,
170177
.centimeter:UnitLength.centimeters.symbol,

‎Sources/Foundation/MassFormatter.swift

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ extension MassFormatter {
1919
}
2020

2121
@available(*, unavailable)
22-
extension MassFormatter : Sendable { }
22+
extension MassFormatter : @unchecked Sendable { }
2323

2424
open class MassFormatter : Formatter {
2525

@@ -69,11 +69,17 @@ open class MassFormatter : Formatter {
6969

7070
// Format a number in kilograms to a localized string with the locale-appropriate unit and an appropriate scale (e.g. 1.2kg = 2.64lb in the US locale).
7171
open func string(fromKilograms numberInKilograms: Double) -> String {
72+
let unitMass: [Unit: UnitMass] = [.gram: .grams,
73+
.kilogram: .kilograms,
74+
.ounce: .ounces,
75+
.pound: .pounds,
76+
.stone: .stones]
77+
7278
//Convert to the locale-appropriate unit
7379
let unitFromKilograms = convertedUnit(fromKilograms: numberInKilograms)
7480

7581
//Map the unit to UnitMass type for conversion later
76-
let unitMassFromKilograms = MassFormatter.unitMass[unitFromKilograms]!
82+
let unitMassFromKilograms = unitMass[unitFromKilograms]!
7783

7884
//Create a measurement object based on the value in kilograms
7985
let kilogramMeasurement = Measurement<UnitMass>(value:numberInKilograms, unit: .kilograms)
@@ -104,12 +110,18 @@ open class MassFormatter : Formatter {
104110

105111
// Return the locale-appropriate unit, the same unit used by -stringFromKilograms:.
106112
open func unitString(fromKilograms numberInKilograms: Double, usedUnit unitp: UnsafeMutablePointer<Unit>?) -> String {
113+
let unitMass: [Unit: UnitMass] = [.gram: .grams,
114+
.kilogram: .kilograms,
115+
.ounce: .ounces,
116+
.pound: .pounds,
117+
.stone: .stones]
118+
107119
//Convert to the locale-appropriate unit
108120
let unitFromKilograms = convertedUnit(fromKilograms: numberInKilograms)
109121
unitp?.pointee = unitFromKilograms
110122

111123
//Map the unit to UnitMass type for conversion later
112-
let unitMassFromKilograms = MassFormatter.unitMass[unitFromKilograms]!
124+
let unitMassFromKilograms = unitMass[unitFromKilograms]!
113125

114126
//Create a measurement object based on the value in kilograms
115127
let kilogramMeasurement = Measurement<UnitMass>(value:numberInKilograms, unit: .kilograms)
@@ -198,14 +210,7 @@ open class MassFormatter : Formatter {
198210

199211
/// The number of pounds in 1 stone
200212
private static let poundsPerStone = 14.0
201-
202-
/// Maps MassFormatter.Unit enum to UnitMass class. Used for measurement conversion.
203-
private static let unitMass: [Unit: UnitMass] = [.gram: .grams,
204-
.kilogram: .kilograms,
205-
.ounce: .ounces,
206-
.pound: .pounds,
207-
.stone: .stones]
208-
213+
209214
/// Maps a unit to its short symbol. Reuses strings from UnitMass.
210215
private static let shortSymbol: [Unit: String] = [.gram: UnitMass.grams.symbol,
211216
.kilogram: UnitMass.kilograms.symbol,

‎Sources/Foundation/MeasurementFormatter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
//
99

1010
@available(*, unavailable)
11-
extension MeasurementFormatter : Sendable { }
11+
extension MeasurementFormatter : @unchecked Sendable { }
1212

1313
@available(*, unavailable, message: "Not supported in swift-corelibs-foundation")
1414
open class MeasurementFormatter : Formatter, NSSecureCoding {

‎Sources/Foundation/NSArray.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
@_implementationOnly import CoreFoundation
1111

1212
@available(*, unavailable)
13-
extension NSArray : Sendable { }
13+
extension NSArray : @unchecked Sendable { }
1414

1515
@available(*, unavailable)
1616
extension NSArray.Iterator : Sendable { }
@@ -752,9 +752,6 @@ public struct NSBinarySearchingOptions : OptionSet, Sendable {
752752
public static let insertionIndex = NSBinarySearchingOptions(rawValue: 1 << 10)
753753
}
754754

755-
@available(*, unavailable)
756-
extension NSMutableArray : Sendable { }
757-
758755
open class NSMutableArray : NSArray {
759756

760757
open func add(_ anObject: Any) {

‎Sources/Foundation/NSAttributedString.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ extension NSAttributedString.Key: _ObjectiveCBridgeable {
4747
public typealias NSAttributedStringKey = NSAttributedString.Key
4848

4949
@available(*, unavailable)
50-
extension NSAttributedString : Sendable { }
50+
extension NSAttributedString : @unchecked Sendable { }
5151

5252
open class NSAttributedString: NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
5353

@@ -435,9 +435,6 @@ extension NSAttributedString {
435435

436436
}
437437

438-
@available(*, unavailable)
439-
extension NSMutableAttributedString : Sendable { }
440-
441438
open class NSMutableAttributedString : NSAttributedString {
442439

443440
open func replaceCharacters(in range: NSRange, with str: String) {

‎Sources/Foundation/NSCFString.swift

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@
1010

1111
@_implementationOnly import CoreFoundation
1212

13-
@available(*, unavailable)
14-
extension _NSCFString : Sendable { }
15-
1613
@usableFromInline
1714
internal class _NSCFString : NSMutableString {
1815
required init(characters: UnsafePointer<unichar>, length: Int) {
@@ -61,9 +58,6 @@ internal class _NSCFString : NSMutableString {
6158
}
6259
}
6360

64-
@available(*, unavailable)
65-
extension _NSCFConstantString : Sendable { }
66-
6761
@usableFromInline
6862
internal final class _NSCFConstantString : _NSCFString {
6963
internal var _ptr : UnsafePointer<UInt8> {

‎Sources/Foundation/NSCache.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fileprivate class NSCacheKey: NSObject {
5454
}
5555

5656
@available(*, unavailable)
57-
extension NSCache : Sendable { }
57+
extension NSCache : @unchecked Sendable { }
5858

5959
open class NSCache<KeyType : AnyObject, ObjectType : AnyObject> : NSObject {
6060

‎Sources/Foundation/NSCalendar.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ extension NSCalendar.Identifier {
220220
}
221221

222222
@available(*, unavailable)
223-
extension NSCalendar : Sendable { }
223+
extension NSCalendar : @unchecked Sendable { }
224224

225225
open class NSCalendar : NSObject, NSCopying, NSSecureCoding {
226226
var _calendar: Calendar

‎Sources/Foundation/NSCharacterSet.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ fileprivate extension String {
6161
}
6262

6363
@available(*, unavailable)
64-
extension NSCharacterSet : Sendable { }
64+
extension NSCharacterSet : @unchecked Sendable { }
6565

6666
open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding {
6767
typealias CFType = CFCharacterSet
@@ -394,9 +394,6 @@ open class NSCharacterSet : NSObject, NSCopying, NSMutableCopying, NSSecureCodin
394394
}
395395
}
396396

397-
@available(*, unavailable)
398-
extension NSMutableCharacterSet : Sendable { }
399-
400397
open class NSMutableCharacterSet : NSCharacterSet {
401398

402399
open func addCharacters(in aRange: NSRange) {

‎Sources/Foundation/NSCoder.swift

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ public protocol NSSecureCoding : NSCoding {
8080
static var supportsSecureCoding: Bool { get }
8181
}
8282

83-
@available(*, unavailable)
84-
extension NSCoder : Sendable { }
85-
8683
/// The `NSCoder` abstract class declares the interface used by concrete
8784
/// subclasses to transfer objects and other values between memory and some
8885
/// other format. This capability provides the basis for archiving (where
@@ -103,6 +100,7 @@ extension NSCoder : Sendable { }
103100
/// is normally of the same class as the object that was originally encoded into
104101
/// the stream. An object can change its class when encoded, however; this is
105102
/// described in Archives and Serializations Programming Guide.
103+
//@_nonSendable
106104
open class NSCoder : NSObject {
107105
internal var _pendingBuffers = Array<(UnsafeMutableRawPointer, Int)>()
108106

‎Sources/Foundation/NSComparisonPredicate.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77
// See http://swift.org/CONTRIBUTORS.txt for the list of Swift project authors
88
//
99

10-
@available(*, unavailable)
11-
extension NSComparisonPredicate : Sendable { }
12-
1310
// Comparison predicates are predicates which do some form of comparison between the results of two expressions and return a BOOL. They take an operator, a left expression, and a right expression, and return the result of invoking the operator with the results of evaluating the expressions.
1411
@available(*, deprecated, message: "NSExpression and classes that rely on its functionality are unsupported in swift-corelibs-foundation: NSComparisonPredicate is unavailable.")
1512
open class NSComparisonPredicate : NSPredicate {

‎Sources/Foundation/NSCompoundPredicate.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ extension NSCompoundPredicate {
1818
}
1919
}
2020

21-
@available(*, unavailable)
22-
extension NSCompoundPredicate : Sendable { }
23-
2421
open class NSCompoundPredicate : NSPredicate {
2522
public init(type: LogicalType, subpredicates: [NSPredicate]) {
2623
if type == .not && subpredicates.isEmpty {

0 commit comments

Comments
 (0)