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

style-guide: Document style editions, start 2024 style edition #113394

Merged
merged 2 commits into from
Aug 1, 2023

Conversation

joshtriplett
Copy link
Member

@joshtriplett joshtriplett commented Jul 6, 2023

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 list
of 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.

@rustbot
Copy link
Collaborator

rustbot commented Jul 6, 2023

r? @yaahc

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-style Relevant to the style team, which will review and decide on the PR/issue. labels Jul 6, 2023
@joshtriplett joshtriplett force-pushed the style-edition-snapshot branch from 933b5e0 to e472607 Compare July 6, 2023 03:06
@bors
Copy link
Contributor

bors commented Jul 6, 2023

☔ The latest upstream changes (presumably #113391) made this pull request unmergeable. Please resolve the merge conflicts.

@joshtriplett joshtriplett force-pushed the style-edition-snapshot branch from e472607 to 2d0e9a8 Compare July 22, 2023 20:49
@joshtriplett joshtriplett marked this pull request as ready for review July 24, 2023 06:51
@rustbot
Copy link
Collaborator

rustbot commented Jul 24, 2023

Some changes occurred in src/doc/style-guide

cc @rust-lang/style

@joshtriplett
Copy link
Member Author

OK, this is ready to merge once reviewed.

@calebcartwright
Copy link
Member

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

@joshtriplett joshtriplett changed the title WIP: style-guide: Document style editions, start 2024 style edition style-guide: Document style editions, start 2024 style edition Jul 26, 2023
@joshtriplett
Copy link
Member Author

@calebcartwright #113392 captures all the ones I felt confident in my ability to capture accurately.

Copy link
Member

@calebcartwright calebcartwright left a 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

@joshtriplett joshtriplett force-pushed the style-edition-snapshot branch from 61fc0b0 to 6a0886c Compare August 1, 2023 00:11
@joshtriplett
Copy link
Member Author

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

@bors
Copy link
Contributor

bors commented Aug 1, 2023

📌 Commit 6a0886c has been approved by calebcartwright

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 Aug 1, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 1, 2023
…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
@bors bors merged commit 0242643 into rust-lang:master Aug 1, 2023
@rustbot rustbot added this to the 1.73.0 milestone Aug 1, 2023
@joshtriplett joshtriplett deleted the style-edition-snapshot branch August 2, 2023 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-style Relevant to the style team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants