Skip to content

[Sema] SR-2327: cherry-pick the change from pull request 4286 for swift-3.0-branch #4345

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
Aug 17, 2016

Conversation

MnO2
Copy link
Contributor

@MnO2 MnO2 commented Aug 17, 2016

What's in this pull request?

This change is to cherry-pick the commit from master as requested in pull request 4286

**** The original description for change. ****
Improve the error message what SR-2327 has described.

With

do {
    guard 1 == 2 else { break }
}

prompt the more helpful error message of error: unlabeled 'break' is only allowed inside a loop or switch, a labeled break is required to exit an if or do

Resolved bug number: (SR-2327)


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.

…d' inside 'do' or 'if'

@tkremenek
Copy link
Member

@swift-ci test macOS

@tkremenek tkremenek self-assigned this Aug 17, 2016
@tkremenek tkremenek merged commit 0219ecd into swiftlang:swift-3.0-branch Aug 17, 2016
@jrose-apple jrose-apple added this to the Swift 3.0 milestone Aug 17, 2016
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