Skip to content

NSString: sync with overlay #1861

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
Jan 30, 2019

Conversation

ianpartridge
Copy link
Contributor

@ianpartridge ianpartridge commented Jan 29, 2019

Over time, NSStringAPI.swift has diverged from the overlay. Bring it back in sync.

Most of these changes are whitespace, but there are important functional changes included, like the port of swiftlang/swift@a088e13 which adds fastpaths for Data -> String conversions.

The diff with whitespace removed is +79 −46. You can hide whitespace changes on GitHub using the "Diff settings" dropdown in the Files changed tab.

@ianpartridge
Copy link
Contributor Author

@swift-ci test

@ianpartridge
Copy link
Contributor Author

CC: @milseman @parkera

@milseman
Copy link
Member

Why does corelibs-foundation contain another copy of a file from Swift that needs to be kept in sync?

@parkera
Copy link
Contributor

parkera commented Jan 29, 2019

We don't currently have a way to share the sources between the two git repos. The build scenarios would be very complicated.

@ianpartridge
Copy link
Contributor Author

@swift-ci test and merge

@swift-ci swift-ci merged commit 38c5882 into swiftlang:master Jan 30, 2019
@ianpartridge ianpartridge deleted the nsstringapi-update branch January 30, 2019 12:01
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