Skip to content

Conversation

jrose-apple
Copy link
Contributor

  • Explanation: Broadens an existing fix-it to apply whenever two function types mismatch on @escaping, even if they have nothing else in common.
  • Scope: Affects diagnostics only, only kicks in when there's a mismatch on @escaping.
  • Issue: rdar://problem/27729540
  • Reviewed by: @milseman
  • Risk: Low.
  • Testing: Added new compiler regression tests.

Before merging this pull request to apple/swift repository:

  • Test pull request on Swift continuous integration.

Triggering Swift CI

The swift-ci is triggered by writing a comment on this PR addressed to the GitHub user @swift-ci. Different tests will run depending on the specific comment that you use. The currently available comments are:

Smoke Testing

Platform Comment
All supported platforms @swift-ci Please smoke test
All supported platforms @swift-ci Please smoke test and merge
OS X platform @swift-ci Please smoke test OS X platform
Linux platform @swift-ci Please smoke test Linux platform

A smoke test on macOS does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library only for macOS. Simulator standard libraries and
    device standard libraries are not built.
  3. lldb is not built.
  4. The test and validation-test targets are run only for macOS. The optimized
    version of these tests are not run.

A smoke test on Linux does the following:

  1. Builds the compiler incrementally.
  2. Builds the standard library incrementally.
  3. lldb is built incrementally.
  4. The swift test and validation-test targets are run. The optimized version of these
    tests are not run.
  5. lldb is tested.

Validation Testing

Platform Comment
All supported platforms @swift-ci Please test
All supported platforms @swift-ci Please test and merge
OS X platform @swift-ci Please test OS X platform
OS X platform @swift-ci Please benchmark
Linux platform @swift-ci Please test Linux platform

Lint Testing

Language Comment
Python @swift-ci Please Python lint

Note: Only members of the Apple organization can trigger swift-ci.

…wiftlang#4181)

...not just those where the functions match otherwise. This allows the
fix-it to be provided in cases where the closure being passed is a
subtype, or when there are generics involved. Yes, the '@escaping'
might not be the only issue, but it will need to get fixed, and
probably independently of anything else that's going on (except
perhaps calling the wrong function).

rdar://problem/27729540
(cherry picked from commit 148e25d)
@jrose-apple jrose-apple added this to the Swift 3.0 milestone Aug 11, 2016
@jrose-apple
Copy link
Contributor Author

@swift-ci Please test

@jrose-apple
Copy link
Contributor Author

Unrelated LLDB test failure, but for maximum confidence we'd want to test again.

@tkremenek tkremenek merged commit 888136f into swiftlang:swift-3.0-branch Aug 12, 2016
@jrose-apple jrose-apple deleted the swift-3-fix-all-the-escapings branch August 12, 2016 00:16
milseman referenced this pull request Aug 13, 2016
This makes the special case diagnostics for detecting a missing
@escaping read through Optional and IUOs.
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