-
Notifications
You must be signed in to change notification settings - Fork 12.7k
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
Alphabetize language features #90935
Conversation
LGTM; r=me when it passes CI. And thanks! |
I'm unable to do r=you 😄 |
Hm. So while this seems OK, it also does make it more annoying to add new features in -- particularly when the tidy lint doesn't tell you where you should put it. I think there was some conversation about a merge driver potentially letting us do this nicely without needing to change the alphabetization? |
A merge driver could work, but it appeared that neither GitHub nor bors support custom drivers. |
I would expect that bors should support a .gitattributes specified merge=union for this file, which I think is correct in most cases -- when no new release has happened? bors currently just shells out to git, so if we can get that to work, I would prefer it over a solution that makes life harder for those adding to this file (which prevents merge conflicts but doesn't fully remove the pain). It also seems like it should be possible to define a filter via .gitattributes that sorts the file automatically on |
Per a discussion on Zulip, I've added a suggestion as to where a feature should be placed. This works on the assumption that features are added at the end of the list, which is currently always the case. If it's added in a different location, the suggestion will technically be correct but is less than ideal. |
Please add the comment to the end of the list indicating the alphabetical ordering (as suggested by @joshtriplett over Zulip, earlier). I think once that's in place, we can merge. |
This should significantly reduce the frequency of merge conflicts.
0e73c33
to
2a82d1c
Compare
Added. |
@bors r+ |
📌 Commit 2a82d1c has been approved by |
…htriplett Alphabetize language features This should significantly reduce the frequency of merge conflicts. r? `@joshtriplett` `@rustbot` label: +A-contributor-roadblock +S-waiting-on-review
…htriplett Alphabetize language features This should significantly reduce the frequency of merge conflicts. r? ``@joshtriplett`` ``@rustbot`` label: +A-contributor-roadblock +S-waiting-on-review
…htriplett Alphabetize language features This should significantly reduce the frequency of merge conflicts. r? ```@joshtriplett``` ```@rustbot``` label: +A-contributor-roadblock +S-waiting-on-review
…askrgr Rollup of 7 pull requests Successful merges: - rust-lang#90733 (Build musl dist artifacts with debuginfo enabled) - rust-lang#90787 (Add `#[inline]`s to `SortedIndexMultiMap`) - rust-lang#90920 (:arrow_up: rust-analyzer) - rust-lang#90933 (Fix await suggestion on non-future type) - rust-lang#90935 (Alphabetize language features) - rust-lang#90949 (update miri) - rust-lang#90958 (Mark `<*const _>::align_offset` and `<*mut _>::align_offset` as `const fn`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
This should significantly reduce the frequency of merge conflicts.
r? @joshtriplett
@rustbot label: +A-contributor-roadblock +S-waiting-on-review