Merge pull request #75495 from hborla/remove-redundant-sendable-stdlib

hborla · web-flow · commit 7d651706146b · 2024-07-26T06:38:19.000-07:00
diff --git a/stdlib/public/core/ContiguousArrayBuffer.swift b/stdlib/public/core/ContiguousArrayBuffer.swift
@@ -63,9 +63,6 @@ internal final class __EmptyArrayStorage
   }
 }
 
-@available(*, unavailable)
-extension __EmptyArrayStorage: Sendable {}
-
 #if $Embedded
 // In embedded Swift, the stdlib is a .swiftmodule only without any .o/.a files,
 // to allow consuming it by clients with different LLVM codegen setting (-mcpu
@@ -120,9 +117,6 @@ internal final class __StaticArrayStorage
   }
 }
 
-@available(*, unavailable)
-extension __StaticArrayStorage: Sendable {}
-
 /// The empty array prototype.  We use the same object for all empty
 /// `[Native]Array<Element>`s.
 @inlinable
@@ -312,9 +306,6 @@ internal final class _ContiguousArrayStorage<
   }
 }
 
-@available(*, unavailable)
-extension _ContiguousArrayStorage: Sendable {}
-
 @_alwaysEmitIntoClient
 @inline(__always)
 internal func _uncheckedUnsafeBitCast<T, U>(_ x: T, to type: U.Type) -> U {
@@ -977,9 +968,6 @@ internal struct _ContiguousArrayBuffer<Element>: _ArrayBufferProtocol {
   }
 }
 
-@available(*, unavailable)
-extension _ContiguousArrayBuffer: Sendable {}
-
 /// Append the elements of `rhs` to `lhs`.
 @inlinable
 internal func += <Element, C: Collection>(
diff --git a/stdlib/public/core/DictionaryBridging.swift b/stdlib/public/core/DictionaryBridging.swift
@@ -421,9 +421,6 @@ final internal class _SwiftDeferredNSDictionary<Key: Hashable, Value>
   }
 }
 
-@available(*, unavailable)
-extension _SwiftDeferredNSDictionary: Sendable {}
-
 // NOTE: older runtimes called this struct _CocoaDictionary. The two
 // must coexist without conflicting ObjC class names from the nested
 // classes, so it was renamed. The old names must not be used in the new
diff --git a/stdlib/public/core/DictionaryStorage.swift b/stdlib/public/core/DictionaryStorage.swift
@@ -110,9 +110,6 @@ internal class __RawDictionaryStorage: __SwiftNativeNSDictionary {
   }
 }
 
-@available(*, unavailable)
-extension __RawDictionaryStorage: Sendable {}
-
 /// The storage class for the singleton empty set.
 /// The single instance of this class is created by the runtime.
 // NOTE: older runtimes called this class _EmptyDictionarySingleton.
@@ -139,9 +136,6 @@ internal class __EmptyDictionarySingleton: __RawDictionaryStorage {
 #endif
 }
 
-@available(*, unavailable)
-extension __EmptyDictionarySingleton: Sendable {}
-
 #if _runtime(_ObjC)
 extension __EmptyDictionarySingleton: _NSDictionaryCore {
   @objc(copyWithZone:)
@@ -511,6 +505,3 @@ extension _DictionaryStorage {
     return storage
   }
 }
-
-extension _DictionaryStorage: @unchecked Sendable
-  where Key: Sendable, Value: Sendable {}
diff --git a/stdlib/public/core/ExistentialCollection.swift b/stdlib/public/core/ExistentialCollection.swift
@@ -166,9 +166,6 @@ internal final class _IteratorBox<Base: IteratorProtocol>
   internal var _base: Base
 }
 
-@available(*, unavailable)
-extension _IteratorBox: Sendable {}
-
 //===--- Sequence ---------------------------------------------------------===//
 //===----------------------------------------------------------------------===//
 
@@ -402,9 +399,6 @@ internal class _AnyCollectionBox<Element>: _AnySequenceBox<Element> {
   ) -> _AnyCollectionBox<Element> { _abstract() }
 }
 
-@available(*, unavailable)
-extension _AnyCollectionBox: Sendable {}
-
 @_fixed_layout
 @usableFromInline
 internal class _AnyBidirectionalCollectionBox<Element>
@@ -468,9 +462,6 @@ internal class _AnyBidirectionalCollectionBox<Element>
   internal func _formIndex(before i: _AnyIndexBox) { _abstract() }
 }
 
-@available(*, unavailable)
-extension _AnyBidirectionalCollectionBox: Sendable {}
-
 @_fixed_layout
 @usableFromInline
 internal class _AnyRandomAccessCollectionBox<Element>
@@ -528,9 +519,6 @@ internal class _AnyRandomAccessCollectionBox<Element>
   ) -> _AnyRandomAccessCollectionBox<Element> { _abstract() }
 }
 
-@available(*, unavailable)
-extension _AnyRandomAccessCollectionBox: Sendable {}
-
 @_fixed_layout
 @usableFromInline
 internal final class _SequenceBox<S: Sequence>: _AnySequenceBox<S.Element> {
@@ -623,9 +611,6 @@ internal final class _SequenceBox<S: Sequence>: _AnySequenceBox<S.Element> {
   internal var _base: S
 }
 
-@available(*, unavailable)
-extension _SequenceBox: Sendable {}
-
 @_fixed_layout
 @usableFromInline
 internal final class _CollectionBox<S: Collection>: _AnyCollectionBox<S.Element>
@@ -820,9 +805,6 @@ internal final class _CollectionBox<S: Collection>: _AnyCollectionBox<S.Element>
   internal var _base: S
 }
 
-@available(*, unavailable)
-extension _CollectionBox: Sendable {}
-
 @_fixed_layout
 @usableFromInline
 internal final class _BidirectionalCollectionBox<S: BidirectionalCollection>
@@ -1036,9 +1018,6 @@ internal final class _BidirectionalCollectionBox<S: BidirectionalCollection>
   internal var _base: S
 }
 
-@available(*, unavailable)
-extension _BidirectionalCollectionBox: Sendable {}
-
 @_fixed_layout
 @usableFromInline
 internal final class _RandomAccessCollectionBox<S: RandomAccessCollection>
@@ -1251,9 +1230,6 @@ internal final class _RandomAccessCollectionBox<S: RandomAccessCollection>
   internal var _base: S
 }
 
-@available(*, unavailable)
-extension _RandomAccessCollectionBox: Sendable {}
-
 @usableFromInline
 @frozen
 internal struct _ClosureBasedSequence<Iterator: IteratorProtocol> {
diff --git a/stdlib/public/core/SetStorage.swift b/stdlib/public/core/SetStorage.swift
@@ -105,9 +105,6 @@ internal class __RawSetStorage: __SwiftNativeNSSet {
   }
 }
 
-@available(*, unavailable)
-extension __RawSetStorage: Sendable {}
-
 /// The storage class for the singleton empty set.
 /// The single instance of this class is created by the runtime.
 // NOTE: older runtimes called this class _EmptySetSingleton. The two
@@ -130,9 +127,6 @@ internal class __EmptySetSingleton: __RawSetStorage {
 #endif
 }
 
-@available(*, unavailable)
-extension __EmptySetSingleton: Sendable {}
-
 #if $Embedded
 // In embedded Swift, the stdlib is a .swiftmodule only without any .o/.a files,
 // to allow consuming it by clients with different LLVM codegen setting (-mcpu
@@ -316,9 +310,6 @@ final internal class _SetStorage<Element: Hashable>
 #endif
 }
 
-@available(*, unavailable)
-extension _SetStorage: Sendable {}
-
 extension _SetStorage {
   @usableFromInline
   @_effects(releasenone)
diff --git a/stdlib/public/core/SwiftNativeNSArray.swift b/stdlib/public/core/SwiftNativeNSArray.swift
@@ -61,9 +61,6 @@ internal class __SwiftNativeNSArrayWithContiguousStorage
   }
 }
 
-@available(*, unavailable)
-extension __SwiftNativeNSArrayWithContiguousStorage: Sendable {}
-
 private let NSNotFound: Int = .max
 
 // Implement the APIs required by NSArray 
@@ -325,9 +322,6 @@ extension __SwiftNativeNSArrayWithContiguousStorage {
   }
 }
 
-@available(*, unavailable)
-extension _SwiftNSMutableArray: Sendable {}
-
 /// An `NSArray` whose contiguous storage is created and filled, upon
 /// first access, by bridging the elements of a Swift `Array`.
 ///
@@ -435,9 +429,6 @@ extension _SwiftNSMutableArray: Sendable {}
   }
 }
 
-@available(*, unavailable)
-extension __SwiftDeferredNSArray: Sendable {}
-
 /// A `__SwiftDeferredNSArray` which is used for static read-only Swift Arrays.
 ///
 /// In contrast to its base class, `__SwiftDeferredStaticNSArray` is generic
@@ -593,6 +584,3 @@ internal class __ContiguousArrayStorageBase
       self !== _emptyArrayStorage, "Deallocating empty array storage?!")
   }
 }
-
-@available(*, unavailable)
-extension __ContiguousArrayStorageBase: Sendable {}

Original file line number	Diff line number	Diff line change
`@@ -63,9 +63,6 @@ internal final class __EmptyArrayStorage`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`
`66`		`-@available(*, unavailable)`
`67`		`-extension __EmptyArrayStorage: Sendable {}`
`68`		`-`
`69`	`66`	`#if $Embedded`
`70`	`67`	`// In embedded Swift, the stdlib is a .swiftmodule only without any .o/.a files,`
`71`	`68`	`// to allow consuming it by clients with different LLVM codegen setting (-mcpu`
`@@ -120,9 +117,6 @@ internal final class __StaticArrayStorage`
`120`	`117`	`}`
`121`	`118`	`}`
`122`	`119`
`123`		`-@available(*, unavailable)`
`124`		`-extension __StaticArrayStorage: Sendable {}`
`125`		`-`
`126`	`120`	`/// The empty array prototype. We use the same object for all empty`
`127`	`121`	/// `[Native]Array<Element>`s.
`128`	`122`	`@inlinable`
`@@ -312,9 +306,6 @@ internal final class _ContiguousArrayStorage<`
`312`	`306`	`}`
`313`	`307`	`}`
`314`	`308`
`315`		`-@available(*, unavailable)`
`316`		`-extension _ContiguousArrayStorage: Sendable {}`
`317`		`-`
`318`	`309`	`@_alwaysEmitIntoClient`
`319`	`310`	`@inline(__always)`
`320`	`311`	`internal func _uncheckedUnsafeBitCast<T, U>(_ x: T, to type: U.Type) -> U {`
`@@ -977,9 +968,6 @@ internal struct _ContiguousArrayBuffer<Element>: _ArrayBufferProtocol {`
`977`	`968`	`}`
`978`	`969`	`}`
`979`	`970`
`980`		`-@available(*, unavailable)`
`981`		`-extension _ContiguousArrayBuffer: Sendable {}`
`982`		`-`
`983`	`971`	/// Append the elements of `rhs` to `lhs`.
`984`	`972`	`@inlinable`
`985`	`973`	`internal func += <Element, C: Collection>(`
Original file line number	Diff line number	Diff line change
`@@ -421,9 +421,6 @@ final internal class _SwiftDeferredNSDictionary<Key: Hashable, Value>`
`421`	`421`	`}`
`422`	`422`	`}`
`423`	`423`
`424`		`-@available(*, unavailable)`
`425`		`-extension _SwiftDeferredNSDictionary: Sendable {}`
`426`		`-`
`427`	`424`	`// NOTE: older runtimes called this struct _CocoaDictionary. The two`
`428`	`425`	`// must coexist without conflicting ObjC class names from the nested`
`429`	`426`	`// classes, so it was renamed. The old names must not be used in the new`
Original file line number	Diff line number	Diff line change
`@@ -110,9 +110,6 @@ internal class __RawDictionaryStorage: __SwiftNativeNSDictionary {`
`110`	`110`	`}`
`111`	`111`	`}`
`112`	`112`
`113`		`-@available(*, unavailable)`
`114`		`-extension __RawDictionaryStorage: Sendable {}`
`115`		`-`
`116`	`113`	`/// The storage class for the singleton empty set.`
`117`	`114`	`/// The single instance of this class is created by the runtime.`
`118`	`115`	`// NOTE: older runtimes called this class _EmptyDictionarySingleton.`
`@@ -139,9 +136,6 @@ internal class __EmptyDictionarySingleton: __RawDictionaryStorage {`
`139`	`136`	`#endif`
`140`	`137`	`}`
`141`	`138`
`142`		`-@available(*, unavailable)`
`143`		`-extension __EmptyDictionarySingleton: Sendable {}`
`144`		`-`
`145`	`139`	`#if _runtime(_ObjC)`
`146`	`140`	`extension __EmptyDictionarySingleton: _NSDictionaryCore {`
`147`	`141`	`@objc(copyWithZone:)`
`@@ -511,6 +505,3 @@ extension _DictionaryStorage {`
`511`	`505`	`return storage`
`512`	`506`	`}`
`513`	`507`	`}`
`514`		`-`
`515`		`-extension _DictionaryStorage: @unchecked Sendable`
`516`		`- where Key: Sendable, Value: Sendable {}`
Original file line number	Diff line number	Diff line change
`@@ -61,9 +61,6 @@ internal class __SwiftNativeNSArrayWithContiguousStorage`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`
`64`		`-@available(*, unavailable)`
`65`		`-extension __SwiftNativeNSArrayWithContiguousStorage: Sendable {}`
`66`		`-`
`67`	`64`	`private let NSNotFound: Int = .max`
`68`	`65`
`69`	`66`	`// Implement the APIs required by NSArray`
`@@ -325,9 +322,6 @@ extension __SwiftNativeNSArrayWithContiguousStorage {`
`325`	`322`	`}`
`326`	`323`	`}`
`327`	`324`
`328`		`-@available(*, unavailable)`
`329`		`-extension _SwiftNSMutableArray: Sendable {}`
`330`		`-`
`331`	`325`	/// An `NSArray` whose contiguous storage is created and filled, upon
`332`	`326`	/// first access, by bridging the elements of a Swift `Array`.
`333`	`327`	`///`
`@@ -435,9 +429,6 @@ extension _SwiftNSMutableArray: Sendable {}`
`435`	`429`	`}`
`436`	`430`	`}`
`437`	`431`
`438`		`-@available(*, unavailable)`
`439`		`-extension __SwiftDeferredNSArray: Sendable {}`
`440`		`-`
`441`	`432`	/// A `__SwiftDeferredNSArray` which is used for static read-only Swift Arrays.
`442`	`433`	`///`
`443`	`434`	/// In contrast to its base class, `__SwiftDeferredStaticNSArray` is generic
`@@ -593,6 +584,3 @@ internal class __ContiguousArrayStorageBase`
`593`	`584`	`self !== _emptyArrayStorage, "Deallocating empty array storage?!")`
`594`	`585`	`}`
`595`	`586`	`}`
`596`		`-`
`597`		`-@available(*, unavailable)`
`598`		`-extension __ContiguousArrayStorageBase: Sendable {}`