Skip to content

Import NSRange from the Darwin overlay #1064

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
Jun 23, 2017

Conversation

phausler
Copy link
Contributor

This has two factors that are updated;
NSRange.swift had a number of changes to handle String range conversions in the Darwin overlay. This commit imports the latest changes to NSRange in but also makes it mergeable back to the Darwin overlay so that we can keep the same source between the two repositories.

This change requires NSScanner for key functions to be updated to be in parity with their Darwin counterparts. Note: not all of NSScanner was updated (and seems to have more work to be done to make the naming updates be in sync)

…d update NSScanner (required for NSRange updates)
@phausler
Copy link
Contributor Author

@swift-ci please test

@phausler phausler merged commit d8a4c18 into swiftlang:master Jun 23, 2017
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.

1 participant