averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove the underscored public protocols from overlays

Browse Source 
These protocols were introduced to work around the problem where
compiler could not correctly handle instance of multiple @available
attributes (one for the language version and another for teh OS version)
applied to the same member.

Now that the compiler issues has been fixed, it is the right time to get
rid of the workarounds.

Addresses: <rdar://problem/36556261>
This commit is contained in:
Max Moiseev
2018-03-30 13:43:38 -07:00
parent 3b14d11aaa
commit a582a7628c
3 changed files with 9 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
stdlib/public/SDK/AVFoundation/AVCaptureDevice.swift
View File

@@ -16,12 +16,8 @@ import Foundation
#if os(iOS)
public protocol _AVCaptureDeviceFormatSupportedColorSpaces {
@available(iOS, introduced: 10.0)
var __supportedColorSpaces: [NSNumber] { get }
}
extension _AVCaptureDeviceFormatSupportedColorSpaces {
@available(iOS, introduced: 10.0)
extension AVCaptureDevice.Format {
@available(swift, obsoleted: 4.0)
@available(iOS, introduced: 10.0)
@nonobjc
@@ -37,9 +33,5 @@ extension _AVCaptureDeviceFormatSupportedColorSpaces {
}
}
@available(iOS, introduced: 10.0)
extension AVCaptureDevice.Format : _AVCaptureDeviceFormatSupportedColorSpaces {
}
#endif

23
stdlib/public/SDK/AVFoundation/AVCapturePhotoOutput.swift
View File

@@ -16,13 +16,8 @@ import Foundation
#if os(iOS)
public protocol _AVCapturePhotoOutputSwiftNativeTypes {
var __supportedFlashModes: [NSNumber] { get }
var __availablePhotoPixelFormatTypes: [NSNumber] { get }
var __availableRawPhotoPixelFormatTypes: [NSNumber] { get }
}
extension _AVCapturePhotoOutputSwiftNativeTypes {
@available(iOS, introduced: 10.0)
extension AVCapturePhotoOutput {
@available(swift, obsoleted: 4.0)
@available(iOS, introduced: 10.0)
@nonobjc
@@ -67,15 +62,7 @@ extension _AVCapturePhotoOutputSwiftNativeTypes {
}
@available(iOS, introduced: 10.0)
extension AVCapturePhotoOutput : _AVCapturePhotoOutputSwiftNativeTypes {
}
public protocol _AVCapturePhotoSettingsSwiftNativeTypes {
var __availablePreviewPhotoPixelFormatTypes: [NSNumber] { get }
}
extension _AVCapturePhotoSettingsSwiftNativeTypes {
extension AVCapturePhotoSettings {
@available(swift, obsoleted: 4.0)
@available(iOS, introduced: 10.0)
@nonobjc
@@ -91,8 +78,4 @@ extension _AVCapturePhotoSettingsSwiftNativeTypes {
}
}
@available(iOS, introduced: 10.0)
extension AVCapturePhotoSettings : _AVCapturePhotoSettingsSwiftNativeTypes {
}
#endif

17
stdlib/public/SDK/Intents/INRideOption.swift
View File

@@ -15,15 +15,9 @@ import Foundation
#if os(iOS) || os(watchOS)
// Simply extending the INRideOption type doesn't work due to:
// <rdar://problem/29447066>
// Compiler incorrectly handles combinations of availability declarations on
// independent axes.
public protocol _INRideOptionMeteredFare {
var __usesMeteredFare: NSNumber? { get set }
}
extension _INRideOptionMeteredFare {
@available(iOS 10.0, watchOS 3.2, *)
extension INRideOption {
@available(iOS 10.0, watchOS 3.2, *)
@available(swift, obsoleted: 4)
@nonobjc
public var usesMeteredFare: NSNumber? {
@@ -35,6 +29,7 @@ extension _INRideOptionMeteredFare {
}
}
@available(iOS 10.0, watchOS 3.2, *)
@available(swift, introduced: 4.0)
@nonobjc
public var usesMeteredFare: Bool? {
@@ -47,8 +42,4 @@ extension _INRideOptionMeteredFare {
}
}
@available(iOS 10.0, watchOS 3.2, *)
extension INRideOption : _INRideOptionMeteredFare {
}
#endif