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

Stabilize style_edition = "2024" in-tree #134929

Merged
merged 1 commit into from
Dec 31, 2024

Conversation

compiler-errors
Copy link
Member

@compiler-errors compiler-errors commented Dec 30, 2024

This PR stabilizes the style_edition flag in rustfmt.

Why am I doing this in-tree? The beta release cut is imminent (according to forge, on January 3) and this is the most lightweight approach to getting this flag stable on nightly. It's imperative (as far as I can tell -- @traviscross can verify or disagree) that we stabilize the style_edition flag so that users can control their style edition separately from the edition.

I'm happy to move this PR to the rustfmt repo and subsequently prepare a subtree sync if someone on @rust-lang/rustfmt believes that we should get this landed on the rustfmt side then synced. If this is the right recourse, I'd like to note that this is still quite time-sensitive. However, I'm happy to dedicate time to get this done if necessary, since I'd really like to un-jeopardize the style edition.

Tracking:

@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 30, 2024
@rustbot
Copy link
Collaborator

rustbot commented Dec 30, 2024

Some changes occurred in src/tools/rustfmt

cc @rust-lang/rustfmt

Copy link
Contributor

@ytmimi ytmimi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm happy to stabilize this in-tree.

@rust-log-analyzer

This comment has been minimized.

@compiler-errors
Copy link
Member Author

Ok, I'll go ahead and approve this for @ytmimi.

If @calebcartwright disagrees with this approach, then sorry for jumping the gun and I'm happy to help out with other solutions. We still have plenty of time (~6 weeks, i.e. all throughout beta) to revert this and go with some other stabilization approach. We should just be mindful that that'll need to do this work on the beta branch :)

@bors r=ytmimi

@bors
Copy link
Contributor

bors commented Dec 31, 2024

📌 Commit f694db1 has been approved by ytmimi

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Dec 31, 2024
@bors
Copy link
Contributor

bors commented Dec 31, 2024

⌛ Testing commit f694db1 with merge 80f5a81df9bdb6e11595b0ac8c0bc843786d926b...

@bors
Copy link
Contributor

bors commented Dec 31, 2024

☀️ Test successful - checks-actions
Approved by: ytmimi
Pushing 80f5a81 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 31, 2024
@bors bors merged commit 80f5a81 into rust-lang:master Dec 31, 2024
7 checks passed
@rustbot rustbot added this to the 1.85.0 milestone Dec 31, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (80f5a81): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
0.4% [0.4%, 0.4%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Max RSS (memory usage)

Results (secondary 6.1%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
6.1% [6.1%, 6.1%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

Results (secondary -2.9%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-2.9% [-2.9%, -2.9%] 1
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 761.022s -> 760.209s (-0.11%)
Artifact size: 325.49 MiB -> 325.50 MiB (0.00%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants