Skip to content

Pseudo-cherry-pick https://github.com/apple/swift/commit/96691208e9b8… #21807

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

Conversation

Catfish-Man
Copy link
Contributor

Virtually all of the substantive changes made it over already, but a few were missed. This is ABI impacting, so we should take it for 5.0.

cc @airspeedswift

@Catfish-Man Catfish-Man requested a review from a team as a code owner January 11, 2019 23:16
@Catfish-Man
Copy link
Contributor Author

@swift-ci please test

Copy link
Member

@milseman milseman left a comment

Choose a reason for hiding this comment

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

LGTM. Is this the entirety of the diff for these files?

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 2c5f8338e9dc895d63a7acdbd50bc80a5b6df89d

@Catfish-Man
Copy link
Contributor Author

Yup, that's all!

@airspeedswift
Copy link
Member

@swift-ci please test

@usableFromInline // FIXME(sil-serialize-all)
@objc
internal init() {}
class __SwiftNativeNSString {
Copy link
Member

Choose a reason for hiding this comment

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

We should try and keep all access explicit, so this should have an internal (doesn't need to happen in this PR tho)

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 2c5f8338e9dc895d63a7acdbd50bc80a5b6df89d

@Catfish-Man
Copy link
Contributor Author

@swift-ci please test

1 similar comment
@Catfish-Man
Copy link
Contributor Author

@swift-ci please test

@airspeedswift airspeedswift merged commit 5958c1e into swiftlang:swift-5.0-branch Jan 15, 2019
@Catfish-Man Catfish-Man deleted the swift-5.0-branch branch January 15, 2019 22:20
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