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

Make std feature list sorted #58632

Merged
merged 1 commit into from
Feb 23, 2019
Merged

Conversation

matklad
Copy link
Member

@matklad matklad commented Feb 22, 2019

This helps to avoid merge conflicts when concurrent PRs append features to the end of the list.

This helps to avoid merge conflicts when concurrent PRs append
features to the end of the list.
@rust-highfive
Copy link
Collaborator

r? @KodrAus

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 22, 2019
@scottmcm
Copy link
Member

➕ 💯

(Would this make sense as a tidy check?)

@petrochenkov
Copy link
Contributor

I wonder why rustfmt doesn't do that (see e.g. in #57318).

@Centril
Copy link
Contributor

Centril commented Feb 22, 2019

r? @Centril

@bors r+

@bors
Copy link
Contributor

bors commented Feb 22, 2019

📌 Commit 88d55f5 has been approved by Centril

@rust-highfive rust-highfive assigned Centril and unassigned KodrAus Feb 22, 2019
@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 Feb 22, 2019
Centril added a commit to Centril/rust that referenced this pull request Feb 22, 2019
Make std feature list sorted

This helps to avoid merge conflicts when concurrent PRs append features to the end of the list.
Centril added a commit to Centril/rust that referenced this pull request Feb 22, 2019
Make std feature list sorted

This helps to avoid merge conflicts when concurrent PRs append features to the end of the list.
bors added a commit that referenced this pull request Feb 22, 2019
Rollup of 17 pull requests

Successful merges:

 - #57656 (Deprecate the unstable Vec::resize_default)
 - #58059 (deprecate before_exec in favor of unsafe pre_exec)
 - #58064 (override `VecDeque::try_rfold`, also update iterator)
 - #58198 (Suggest removing parentheses surrounding lifetimes)
 - #58431 (fix overlapping references in BTree)
 - #58555 (Add a note about 2018e if someone uses `try {` in 2015e)
 - #58588 (remove a bit of dead code)
 - #58589 (cleanup macro after 2018 transition)
 - #58591 (Dedup a rustdoc diagnostic construction)
 - #58600 (fix small documentation typo)
 - #58601 (Search for target_triple.json only if builtin target not found)
 - #58606 (Docs: put Future trait into spotlight)
 - #58607 (Fixes #58586: Make E0505 erronous example fail for the 2018 edition)
 - #58615 (miri: explain why we use static alignment in ref-to-place conversion)
 - #58620 (introduce benchmarks of BTreeSet.intersection)
 - #58621 (Update miri links)
 - #58632 (Make std feature list sorted)

Failed merges:

r? @ghost
@bors bors merged commit 88d55f5 into rust-lang:master Feb 23, 2019
@matklad matklad deleted the reduce-contention branch February 23, 2019 10:30
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants