-
Notifications
You must be signed in to change notification settings - Fork 12.9k
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
style-guide: Document style editions, start 2024 style edition #113394
Conversation
r? @yaahc (rustbot has picked a reviewer for you, use r? to override) |
933b5e0
to
e472607
Compare
☔ The latest upstream changes (presumably #113391) made this pull request unmergeable. Please resolve the merge conflicts. |
e472607
to
2d0e9a8
Compare
Some changes occurred in src/doc/style-guide cc @rust-lang/style |
OK, this is ready to merge once reviewed. |
I thought we might have one outstanding activity to grab a couple of commits from the old repo that didn't get pulled over? If so then I definitely want to make sure we get those captured before we snapshot anything |
@calebcartwright #113392 captures all the ones I felt confident in my ability to capture accurately. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Might be worth linking to general edition docs and the style evolution RFC, but this lgtm as is anyway.
r=me whenever/so long as #114154 gets incorporated into the 2015-2021 archived version
Link to a snapshot for the 2015/2018/2021 style edition.
61fc0b0
to
6a0886c
Compare
I've added a link to the edition guide. I was trying to document style editions in a self-contained way within the style guide, rather than linking out to the style edition RFC, since the RFC doesn't seem like it'd be as good at being end-user documentation. But I'm happy to expand it further, if you think there's something missing. I'd like to get the snapshot done first, though. @bors r=calebcartwright rollup |
…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#111081 (impl SliceIndex<str> for (Bound<usize>, Bound<usize>)) - rust-lang#113394 (style-guide: Document style editions, start 2024 style edition) - rust-lang#113588 (bootstrap: use git merge-base for LLVM CI download logic) - rust-lang#113743 (Directly link more target docs) - rust-lang#114262 (Improve the rust style guide doc) - rust-lang#114309 (Update books) - rust-lang#114313 ([rustc_data_structures] Simplify SortedMap::insert.) r? `@ghost` `@rustbot` modify labels: rollup
Link to a snapshot for the 2015/2018/2021 style edition.
This is a draft, because I'd like to wait for a few style guide fixes to merge
before snapshotting the 2015/2018/2021 style edition:
I'd like to wait for these for two reasons: to make it easier to see the
differences between the 2015/2018/2021 style edition and the 2024 style
edition (without the noise of guide-wide changes), and to minimize confusion so
that bugfixes to the style guide that we include in the previous edition don't
look like they're only part of the 2024 style edition.
I've used "Miscellaneous
rustfmt
bugfixes" as a starting point for the listof 2024 changes, for now. We can update that when we add more 2024 changes.
The section added in this PR can then serve as a baseline for our drafts of
2024 style edition changes.
In the meantime, I'd like to get someone from @rust-lang/style to review and
approve the text here; I'll update it with a commit hash when the above PRs
have merged.