Skip to content

[String] Add _CocoaString typealias to all build configurations. #20338

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.

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
Nov 6, 2018

Conversation

milseman
Copy link
Member

@milseman milseman commented Nov 5, 2018

Conditionally compiling out _CocoaString from 32-bit string will be
way too unweidly. Fixes Android bots.

@milseman
Copy link
Member Author

milseman commented Nov 5, 2018

@swift-ci please smoke test and merge

@stephentyrone
Copy link
Contributor

What could possibly go wrong?

@@ -12,14 +12,14 @@

import SwiftShims

/// Effectively an untyped NSString that doesn't require foundation.
public typealias _CocoaString = AnyObject
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it can be @usableFromInline internal now?

Copy link
Member

@lorentey lorentey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

Conditionally compiling out _CocoaString from 32-bit string will be
way too unweidly. Fixes Android bots.
@milseman
Copy link
Member Author

milseman commented Nov 6, 2018

@swift-ci please smoke test os x platform

@milseman milseman merged commit d6206d5 into swiftlang:master Nov 6, 2018
@milseman milseman deleted the hot_cocoa branch November 6, 2018 18:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants