Skip to content

Merge main into release/6.2 #3057

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

Closed

Conversation

github-actions[bot]
Copy link

This PR was automatically opened by a GitHub action. Review the changes included in this PR and determine if they should be included in the release branch. If yes, merge the PR. Otherwise revert changes that should not be included on this branch.

ahoppen and others added 29 commits March 28, 2025 14:50
`name` should have been in a string interpolation here.

This makes swift-syntax build without warnings
… expression macro in lexicalContext

Resolves rdar://109470248
We can say that any `try`/`await` element also covers all elements to
the right of it in an unfolded sequence. Cases where this isn't true
will be rejected by the compiler, e.g:

```
0 * try foo() + bar()
_ = try foo() ~~~ bar() // Assuming `~~~` has lower precedence than `=`
```

rdar://109470248
Match the behavior of `try` and `await`.
Introduce `try` and `await` macro lexical contexts with unfolded sequence handling
We are outputting lots of extra newlines on Windows, which makes it
hard to read the diagnostics.

rdar://148520063
Adds missing dependencies to the version marker modules from SwiftSyntax so that they can be found from a `canImport`.
[Windows] Remove extra newlines from diagnostic output.
Swift 5.8 was removed from the underlying workflow in swiftlang/github-workflows#107
…ng` argument

This is part of SE-0461 proposal where `nonisolated` has to be
marked as `nonsending` in type context to indicate that the
function type it's attached to is caller isolated.
…suming '('

It's possible that `(nonsending)` was omitted and instead we are
at the parameter list of a function type. Checking ahead allows
for a better diagnostics and recovery.
Removes duplicate trivia from UnsafeExprSyntax
Change default release version for GitHub action to 603.0.0 + add version marker module
…a release branch

In the first period after branching the release branch, we want to include many changes from `main` also in the release branch. This workflow automatically creates a PR every Monday to merge main into the release branch.

Later in the release cycle we should stop this practice to avoid landing risky changes by disabling this workflow.

Similar to swiftlang/swift-format#986
Add GitHub action that automatically creates a PR to merge main into a release branch
…odifiers while skipping

Otherwise in situations like `nonisolated()` `canParseType` would
return `true` because `()` is valid type.
 [SwiftParser] Implement `nonisolated(nonsending)` specifier
@github-actions github-actions bot requested a review from keith as a code owner April 16, 2025 22:34
@ahoppen
Copy link
Member

ahoppen commented Apr 16, 2025

@swift-ci Please test

@ahoppen ahoppen enabled auto-merge April 16, 2025 22:40
@ahoppen
Copy link
Member

ahoppen commented Apr 17, 2025

Let’s merge #3052 first and then I’ll run the GitHub action again to create a new main -> release/6.2 PR.

@ahoppen ahoppen closed this Apr 17, 2025
auto-merge was automatically disabled April 17, 2025 16:51

Pull request was closed

@ahoppen ahoppen deleted the automerge/merge-main-2025-04-16_22-33 branch April 17, 2025 17:53
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.

8 participants