Skip to content

Update to Swift 4 #1022

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 3 commits into from
Jun 26, 2017
Merged

Update to Swift 4 #1022

merged 3 commits into from
Jun 26, 2017

Conversation

spevans
Copy link
Contributor

@spevans spevans commented May 31, 2017

Changes only compatible with swift 4.

Depends on:
#995 (but requires SE-110 to be reverted)
#1023
#1024

@spevans spevans force-pushed the pr_swift4_only branch 3 times, most recently from a843648 to 939d2fc Compare June 3, 2017 16:22
@spevans spevans force-pushed the pr_swift4_only branch 2 times, most recently from 4c7a1b9 to 9517d5e Compare June 14, 2017 06:42
@parkera
Copy link
Contributor

parkera commented Jun 21, 2017

Are we good to go on this one?

@spevans
Copy link
Contributor Author

spevans commented Jun 21, 2017

No there are still a few closure issues that popped up. I saw that some of SE-110 was reverted but I dont think it has been fully done. I will do a quick test and see what is still broken

@spevans
Copy link
Contributor Author

spevans commented Jun 21, 2017

There were some changes still needed but mostly it was listing the exact number of arguments before in. Ive added a 2nd commit with the changes and it tested ok on Linux.

The PR for the rollback of SE110 is swiftlang/swift#10414

@spevans spevans changed the title [WIP] Swift 4 only changes Update to Swift 4 Jun 23, 2017
@spevans
Copy link
Contributor Author

spevans commented Jun 23, 2017

@parkera If you are happy with the closure changes I think this is good to go

@@ -109,16 +109,16 @@ open class NotificationQueue: NSObject {
var predicate: (NSNotificationListEntry) -> Bool
switch coalesceMask {
case [.onName, .onSender]:
predicate = { (entryNotification, _) in
return _SwiftValue.store(notification.object) !== _SwiftValue.store(entryNotification.object) || notification.name != entryNotification.name
predicate = { entry in
Copy link
Contributor

Choose a reason for hiding this comment

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

Could this one have remained as previous with the SE-110 revert?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unfortunately these three still gave the error 'does not support destructuring' even after I checked it with the latest compiler, but it was the only ones.

Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe we should follow up on that separately but it shouldn't hold this up.

@parkera
Copy link
Contributor

parkera commented Jun 26, 2017

One small question but otherwise looks good

@parkera
Copy link
Contributor

parkera commented Jun 26, 2017

@swift-ci test and merge

@swift-ci swift-ci merged commit 22fc7f4 into swiftlang:master Jun 26, 2017
@spevans spevans deleted the pr_swift4_only branch August 9, 2017 06:38
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