Skip to content

Remove unused Foundation subclasses #26374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 27, 2019
Merged

Remove unused Foundation subclasses #26374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions stdlib/public/core/Runtime.swift.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,17 +305,6 @@ internal class __SwiftNativeNSEnumerator {
deinit {}
}

// FIXME(ABI)#60 : move into the Foundation overlay and remove 'open'
@_fixed_layout
@objc @_swift_native_objc_runtime_base(__SwiftNativeNSDataBase)
open class __SwiftNativeNSData {
@inlinable
@objc public init() {}
@objc public init(coder: AnyObject) {}
@inlinable
deinit {}
}

//===----------------------------------------------------------------------===//
// Support for reliable testing of the return-autoreleased optimization
//===----------------------------------------------------------------------===//
Expand Down
2 changes: 1 addition & 1 deletion stdlib/public/stubs/SwiftNativeNSXXXBase.mm.gyb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ using namespace swift;
// NOTE: older runtimes called these _SwiftNativeNSXXXBase. The two must
// coexist, so these were renamed. The old names must not be used in the new
// runtime.
% for Class in ('Array', 'Dictionary', 'Set', 'String', 'Enumerator', 'Data', 'IndexSet'):
% for Class in ('Array', 'Dictionary', 'Set', 'String', 'Enumerator'):
SWIFT_RUNTIME_STDLIB_API
@interface __SwiftNativeNS${Class}Base : NS${Class}
{
Expand Down
1 change: 1 addition & 0 deletions test/api-digester/Outputs/stability-stdlib-abi.asserts.additional.swift.expected
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
Class __SwiftNativeNSData has been removed
Func _collectReferencesInsideObject(_:) is a new API without @available attribute
Func _loadDestroyTLSCounter() is a new API without @available attribute
Protocol _RuntimeFunctionCountersStats is a new API without @available attribute
Expand Down
2 changes: 0 additions & 2 deletions test/stdlib/Inputs/SwiftNativeNSBase/SwiftNativeNSBase.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ BOOL TestSwiftNativeNSBase_UnwantedCdtors()
@"__SwiftNativeNSSetBase",
@"__SwiftNativeNSStringBase",
@"__SwiftNativeNSEnumeratorBase",
@"__SwiftNativeNSDataBase",
@"__SwiftNativeNSIndexSetBase",
nil];

for (unsigned int i = 0; i < classCount; i++) {
Expand Down