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

Merge main into release/6.1 #911

Merged
merged 8 commits into from
Jan 8, 2025

Conversation

ahoppen
Copy link
Member

@ahoppen ahoppen commented Jan 8, 2025

macshome and others added 8 commits December 18, 2024 17:54
…mance PrettyPrinterPerformance Optimized the PrettyPrinter for swiftlang#894

Worked to get the perfomance to be closer to where we were before the changes in swiftlang#883. This code should be only about 1.5% slower rather than 7% slower.

Using a lazy filter as `count(where:_)` isn't avaliable < Swift 6.0.

One forward loop and using the UTF8 view makes this faster than the original code pre-swiftlang#883.
PrettyPrinterPerformance Optimized the PrettyPrinter for swiftlang#894
…terPerformance

Revert "PrettyPrinterPerformance Optimized the PrettyPrinter for swiftlang#894"
…when a function starts or ends with a comment
…losingBraces

Fix NoEmptyLinesOpeningClosingBraces to respect consecutive newlines when a function starts or ends with a comment
@ahoppen ahoppen changed the title Merge main 6.1 2025 01 08 Merge main into release/6.1 Jan 8, 2025
@ahoppen ahoppen merged commit 8c4e008 into swiftlang:release/6.1 Jan 8, 2025
19 checks passed
@ahoppen ahoppen deleted the merge-main-6.1-2025-01-08 branch January 8, 2025 18:27
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.

5 participants