[stdlib] Remove ignored platform-agnostic '@available' from extensions

jrose-apple · jrose-apple · commit 74a4adc54ca5 · 2018-03-14T16:37:40.000-07:00
It looks like we exposed a bunch of Metal APIs to Swift 3 that we
didn't mean to; at this point it would be a source-breaking change to
hide them. Oops.
diff --git a/stdlib/public/SDK/Metal/Metal.swift b/stdlib/public/SDK/Metal/Metal.swift
@@ -12,7 +12,6 @@
 
 @_exported import Metal // Clang module
 
-@available(swift 4)
 @available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
 extension MTLBlitCommandEncoder {
     
@@ -21,7 +20,6 @@ extension MTLBlitCommandEncoder {
     }
 }
 
-@available(swift 4)
 @available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
 extension MTLBuffer {
     
@@ -38,7 +36,6 @@ extension MTLBuffer {
     }
 }
 
-@available(swift 4)
 @available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
 extension MTLComputeCommandEncoder {
     
@@ -69,7 +66,6 @@ extension MTLComputeCommandEncoder {
     }
 }
 
-@available(swift 4)
 @available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
 extension MTLDevice {
     
@@ -92,7 +88,6 @@ public func MTLCopyAllDevicesWithObserver(handler: @escaping MTLDeviceNotificati
 }
 #endif
 
-@available(swift 4)
 @available(macOS 10.12, iOS 10.0, tvOS 10.0, *)
 extension MTLFunctionConstantValues {
     
@@ -102,7 +97,6 @@ extension MTLFunctionConstantValues {
     
 }
 
-@available(swift 4)
 @available(macOS 10.13, iOS 11.0, tvOS 11.0, *)
 extension MTLArgumentEncoder {
     
@@ -119,7 +113,6 @@ extension MTLArgumentEncoder {
     }
 }
 
-@available(swift 4)
 @available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
 extension MTLRenderCommandEncoder {
     
@@ -201,7 +194,6 @@ extension MTLRenderCommandEncoder {
 #endif
 }
 
-@available(swift 4)
 @available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
 extension MTLRenderPassDescriptor {
     
@@ -220,7 +212,6 @@ extension MTLRenderPassDescriptor {
     
 }
 
-@available(swift 4)
 @available(macOS 10.11, iOS 8.0, tvOS 8.0, *)
 extension MTLTexture {
     
diff --git a/stdlib/public/SDK/MetalKit/MetalKit.swift b/stdlib/public/SDK/MetalKit/MetalKit.swift
@@ -12,7 +12,6 @@
 
 @_exported import MetalKit // Clang module
 
-@available(swift 4)
 @available(macOS 10.11, iOS 9.0, tvOS 9.0, *)
 extension MTKMesh {
     public class func newMeshes(asset: MDLAsset, device: MTLDevice) throws -> (modelIOMeshes: [MDLMesh], metalKitMeshes: [MTKMesh]) {
diff --git a/stdlib/public/SDK/UIKit/UIKit.swift b/stdlib/public/SDK/UIKit/UIKit.swift
@@ -95,11 +95,9 @@ extension _UIKitNumericRawRepresentable {
   }
 }
 
-@available(swift 4)
 extension UIFont.Weight : _UIKitNumericRawRepresentable {}
 
 #if !os(watchOS)
-@available(swift 4)
 extension UILayoutPriority : _UIKitNumericRawRepresentable {}
 #endif
 
diff --git a/stdlib/public/core/Integers.swift.gyb b/stdlib/public/core/Integers.swift.gyb
@@ -3841,7 +3841,6 @@ extension SignedNumeric where Self : Comparable {
   }
 }
 
-@available(swift, obsoleted: 4)
 extension BinaryInteger {
   @_inlineable // FIXME(sil-serialize-all)
   @available(swift, obsoleted: 4)

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,6 @@`
`12`	`12`
`13`	`13`	`@_exported import Metal // Clang module`
`14`	`14`
`15`		`-@available(swift 4)`
`16`	`15`	`@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)`
`17`	`16`	`extension MTLBlitCommandEncoder {`
`18`	`17`
`@@ -21,7 +20,6 @@ extension MTLBlitCommandEncoder {`
`21`	`20`	`}`
`22`	`21`	`}`
`23`	`22`
`24`		`-@available(swift 4)`
`25`	`23`	`@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)`
`26`	`24`	`extension MTLBuffer {`
`27`	`25`
`@@ -38,7 +36,6 @@ extension MTLBuffer {`
`38`	`36`	`}`
`39`	`37`	`}`
`40`	`38`
`41`		`-@available(swift 4)`
`42`	`39`	`@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)`
`43`	`40`	`extension MTLComputeCommandEncoder {`
`44`	`41`
`@@ -69,7 +66,6 @@ extension MTLComputeCommandEncoder {`
`69`	`66`	`}`
`70`	`67`	`}`
`71`	`68`
`72`		`-@available(swift 4)`
`73`	`69`	`@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)`
`74`	`70`	`extension MTLDevice {`
`75`	`71`
`@@ -92,7 +88,6 @@ public func MTLCopyAllDevicesWithObserver(handler: @escaping MTLDeviceNotificati`
`92`	`88`	`}`
`93`	`89`	`#endif`
`94`	`90`
`95`		`-@available(swift 4)`
`96`	`91`	`@available(macOS 10.12, iOS 10.0, tvOS 10.0, *)`
`97`	`92`	`extension MTLFunctionConstantValues {`
`98`	`93`
`@@ -102,7 +97,6 @@ extension MTLFunctionConstantValues {`
`102`	`97`
`103`	`98`	`}`
`104`	`99`
`105`		`-@available(swift 4)`
`106`	`100`	`@available(macOS 10.13, iOS 11.0, tvOS 11.0, *)`
`107`	`101`	`extension MTLArgumentEncoder {`
`108`	`102`
`@@ -119,7 +113,6 @@ extension MTLArgumentEncoder {`
`119`	`113`	`}`
`120`	`114`	`}`
`121`	`115`
`122`		`-@available(swift 4)`
`123`	`116`	`@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)`
`124`	`117`	`extension MTLRenderCommandEncoder {`
`125`	`118`
`@@ -201,7 +194,6 @@ extension MTLRenderCommandEncoder {`
`201`	`194`	`#endif`
`202`	`195`	`}`
`203`	`196`
`204`		`-@available(swift 4)`
`205`	`197`	`@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)`
`206`	`198`	`extension MTLRenderPassDescriptor {`
`207`	`199`
`@@ -220,7 +212,6 @@ extension MTLRenderPassDescriptor {`
`220`	`212`
`221`	`213`	`}`
`222`	`214`
`223`		`-@available(swift 4)`
`224`	`215`	`@available(macOS 10.11, iOS 8.0, tvOS 8.0, *)`
`225`	`216`	`extension MTLTexture {`
`226`	`217`
Original file line number	Diff line number	Diff line change
`@@ -95,11 +95,9 @@ extension _UIKitNumericRawRepresentable {`
`95`	`95`	`}`
`96`	`96`	`}`
`97`	`97`
`98`		`-@available(swift 4)`
`99`	`98`	`extension UIFont.Weight : _UIKitNumericRawRepresentable {}`
`100`	`99`
`101`	`100`	`#if !os(watchOS)`
`102`		`-@available(swift 4)`
`103`	`101`	`extension UILayoutPriority : _UIKitNumericRawRepresentable {}`
`104`	`102`	`#endif`
`105`	`103`
Original file line number	Diff line number	Diff line change
`@@ -3841,7 +3841,6 @@ extension SignedNumeric where Self : Comparable {`
`3841`	`3841`	`}`
`3842`	`3842`	`}`
`3843`	`3843`
`3844`		`-@available(swift, obsoleted: 4)`
`3845`	`3844`	`extension BinaryInteger {`
`3846`	`3845`	`@_inlineable // FIXME(sil-serialize-all)`
`3847`	`3846`	`@available(swift, obsoleted: 4)`