Skip to content

Clean up matchTypes() and related code a little #21763

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 6 commits into from
Jan 10, 2019

Conversation

slavapestov
Copy link
Contributor

No description provided.

@slavapestov slavapestov requested a review from xedin January 10, 2019 04:06
@slavapestov
Copy link
Contributor Author

@swift-ci Please smoke test

@slavapestov
Copy link
Contributor Author

@swift-ci Please test source compatibility

@slavapestov
Copy link
Contributor Author

@xedin This is the first step in a larger cleanup of some code around InOutType and the weird LValueType/InOutType conversions. Just wanted to post this part for review since I know you're hacking here too as part of the diagnostics work. If you want I can hold off merging until your changes go in, I don't mind rebasing.

Copy link
Contributor

@xedin xedin left a comment

Choose a reason for hiding this comment

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

LGTM! It seems like the merge wouldn’t be that bad with changes I have, if you were to merge this.

@slavapestov
Copy link
Contributor Author

@swift-ci Please test source compatibility

@slavapestov
Copy link
Contributor Author

@swift-ci Please smoke test

@slavapestov
Copy link
Contributor Author

@swift-ci Please smoke test Linux

@slavapestov
Copy link
Contributor Author

/home/buildnode/jenkins/workspace/swift-PR-Linux-smoke-test/branch-master/swift-corelibs-foundation/TestFoundation/TestNSString.swift:393: error: TestNSString.test_FromContentsOfURL : XCTAssertEqual failed: ("Pf
07:34:08 <o�
07:34:08 
07:34:08 e is encoded as ISO-8859-1
07:34:08 ÀÁÂÃÄÅÿ
07:34:08 ±
07:34:08 ") is not equal to ("This file is encoded as ISO-8859-1
07:34:08 ÀÁÂÃÄÅÿ
07:34:08 ±
07:34:08 ") - 

Hmm...

@PFCAwesome
Copy link

PFCAwesome commented Jan 10, 2019 via email

@slavapestov slavapestov force-pushed the match-types-cleanup branch 2 times, most recently from 134fed6 to 4dfbd8f Compare January 10, 2019 16:38
@slavapestov
Copy link
Contributor Author

@swift-ci Please smoke test

@slavapestov slavapestov merged commit 66189dc into swiftlang:master Jan 10, 2019
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.

3 participants