Skip to content
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

Remove -swift-version 3 from a handful of tests and update them appro… #17748

Merged
merged 1 commit into from
Jul 6, 2018
Merged

Remove -swift-version 3 from a handful of tests and update them appro… #17748

merged 1 commit into from
Jul 6, 2018

Conversation

rudkx
Copy link
Contributor

@rudkx rudkx commented Jul 4, 2018

…priately.

These are all tests that would otherwise fail if the expression type
checker support for Swift 3 is removed.

I've moved some of the code from deleted Migrator tests into new
Constraints tests that verify that we do not support the constructs.

@rudkx
Copy link
Contributor Author

rudkx commented Jul 4, 2018

@swift-ci Please smoke test

@@ -153,25 +151,13 @@ do {
}

// INT_ANY: Begin completions
// INT_ANY-DAG: Decl{{.*}}/TypeRelation[Convertible]: intToAny(a:);
Copy link
Contributor

Choose a reason for hiding this comment

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

Why did these completions go away? Is it a bug?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I asked that same question of @benlangmuir on the other PR. I haven't had a chance to look into it at all, but if it's unexpected we can open a JIRA and look into it.

Copy link
Contributor

Choose a reason for hiding this comment

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

I filed a radar about it already but I thought you determined the change was correct. Until we find out can you leave this test as is for now?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@slavapestov I'm not planning on merging anything until @benlangmuir has a chance to reply to my question below.

@@ -1,6 +1,6 @@
// This source file is part of the Swift.org open source project
//
// Copyright (c) 2014 - 2017 Apple Inc. and the Swift project authors
// Copyright (c) 2014 - 2018 Apple Inc. and the Swift project authors
Copy link
Contributor

Choose a reason for hiding this comment

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

Is this really necessary?

Copy link
Contributor Author

@rudkx rudkx Jul 4, 2018

Choose a reason for hiding this comment

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

Yes. Copyright dates should be updated when files are updated. I had the same updates you had plus this, so I kept this as part of the rebase.

…priately.

These are all tests that would otherwise fail if the expression type
checker support for Swift 3 is removed.

I've moved some of the code from deleted Migrator tests into new
Constraints tests that verify that we do not support the constructs.
@rudkx
Copy link
Contributor Author

rudkx commented Jul 5, 2018

@swift-ci Please smoke test

@rudkx
Copy link
Contributor Author

rudkx commented Jul 5, 2018

@benlangmuir I've updated the code completion results based on the current output. It turns out some completions didn't go away, they just had different content and different order. Apparently that's what we've been generating for a while now for -swift-version 4, but from glancing at the differences I have no idea if that would be expected. Should I open a JIRA for those differences, or do you already know why this is different?

@rudkx
Copy link
Contributor Author

rudkx commented Jul 6, 2018

@swift-ci Please smoke test

@rudkx
Copy link
Contributor Author

rudkx commented Jul 6, 2018

We have a bug tracking this yet unexplained difference. I discussed with @nathawes to make sure this seems okay to merge given that this is not a new behavior (i.e. -swift-version 4 already produced these completion results) and we have a bug tracking investigation of the differences.

@rudkx rudkx merged commit dec3341 into swiftlang:master Jul 6, 2018
@rudkx rudkx deleted the remove-swift3-from-some-tests branch July 6, 2018 22:59
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.

2 participants