Skip to content

Merge main into release/6.2 #3063

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 15 commits into from
Apr 22, 2025
Merged

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.

xedin and others added 15 commits April 8, 2025 19:04
…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.
…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
…without source location info

Some tools want to use the diagnostics formatter to produce diagnostics
that don't relate to source code, or for which the source code isn't
available. This API allows them to do so while maintaining consistent
presentation. The first client is the compiler itself, when it doesn't
have a source location for a specific diagnostic.
Add a new API DiagnosticsFormatter.formattedMessage(_:) for messages without source location info
Grant write permissions for content an pull requests to auto merge GitHub action
@github-actions github-actions bot requested a review from a team as a code owner April 21, 2025 18:31
@bnbarham
Copy link
Contributor

@swift-ci please test

@bnbarham
Copy link
Contributor

@swift-ci please test Linux platform

@xedin
Copy link
Contributor

xedin commented Apr 21, 2025

@swift-ci please clean test macOS platform

@shahmishal shahmishal marked this pull request as draft April 21, 2025 21:47
@shahmishal shahmishal marked this pull request as ready for review April 21, 2025 21:48
@DougGregor
Copy link
Member

@swift-ci please test Windows

@bnbarham bnbarham marked this pull request as draft April 22, 2025 01:49
@bnbarham bnbarham marked this pull request as ready for review April 22, 2025 01:49
@bnbarham bnbarham closed this Apr 22, 2025
@bnbarham bnbarham reopened this Apr 22, 2025
@bnbarham
Copy link
Contributor

Heh, so PRs opened by GITHUB_TOKEN do not run actions by default. Close and open is one workaround, another is to open as draft and then have the workflows trigger on ready_for_review.

@bnbarham bnbarham merged commit 447a849 into release/6.2 Apr 22, 2025
27 checks passed
@bnbarham bnbarham deleted the automerge/merge-main-2025-04-21_18-31 branch April 22, 2025 15:58
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.

4 participants