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.

Sign up for GitHub

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

Jump to bottom

Clean up, categorize and sort unstable features in std. #95032

Merged
merged 1 commit into from
Apr 1, 2022
Merged

Clean up, categorize and sort unstable features in std. #95032

merged 1 commit into from
Apr 1, 2022

Conversation

m-ou-se
Copy link
Member

@m-ou-se m-ou-se commented Mar 17, 2022

No description provided.

@m-ou-se m-ou-se added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Mar 17, 2022
@rust-highfive
Copy link
Collaborator

r? @yaahc

(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 Mar 17, 2022
@yaahc
Copy link
Member

yaahc commented Mar 17, 2022

@bors r+

@bors
Copy link
Contributor

bors commented Mar 17, 2022

📌 Commit 3820c1d97a1af6204b9a86fbe47df11803ceb44f has been approved by yaahc

@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 Mar 17, 2022
@yaahc
Copy link
Member

yaahc commented Mar 17, 2022 •
edited

wait no, i hit enter too soon, it's not passing

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 17, 2022
@bors
Copy link
Contributor

bors commented Mar 30, 2022

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

@m-ou-se m-ou-se force-pushed the std-features branch 2 times, most recently from 07d1bc9 to 39a8442 Compare March 30, 2022 14:29
@m-ou-se
Copy link
Member Author

m-ou-se commented Mar 30, 2022

I've put two missing features back, and rebased. Let's try again.

@bors r=yaahc

@bors
Copy link
Contributor

bors commented Mar 30, 2022

📌 Commit 39a8442 has been approved by yaahc

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 30, 2022
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 30, 2022
@Dylan-DPC
Rollup merge of rust-lang#95032 - m-ou-se:std-features, r=yaahc
5df71e1 
Clean up, categorize and sort unstable features in std.
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 30, 2022
Closed
Dylan-DPC added a commit to Dylan-DPC/rust that referenced this pull request Mar 30, 2022
@Dylan-DPC
Rollup merge of rust-lang#95032 - m-ou-se:std-features, r=yaahc
e0719bd 
Clean up, categorize and sort unstable features in std.
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 30, 2022
Closed
@Dylan-DPC
Copy link
Member

failed in rollup

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 30, 2022
@m-ou-se
Copy link
Member Author

m-ou-se commented Mar 31, 2022

Turns out associated_type_bounds was used in std::sys::sgx. I'll leave it for now and send a separate PR to remove it, since it doesn't really need it.

@bors r=yaahc

@bors
Copy link
Contributor

bors commented Mar 31, 2022

📌 Commit 7922024 has been approved by yaahc

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Mar 31, 2022
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 1, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 1, 2022
@bors
Auto merge of rust-lang#95552 - matthiaskrgr:rollup-bxminn9, r=matthi…
297a801 
…askrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#95032 (Clean up, categorize and sort unstable features in std.)
 - rust-lang#95260 (Better suggestions for `Fn`-family trait selection errors)
 - rust-lang#95293 (suggest wrapping single-expr blocks in square brackets)
 - rust-lang#95344 (Make `impl Debug for rustdoc::clean::Item` easier to read)
 - rust-lang#95388 (interpret: make isize::MAX the limit for dynamic value sizes)
 - rust-lang#95530 (rustdoc: do not show primitives and keywords as private)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 3cb5925 into rust-lang:master Apr 1, 2022
@rustbot rustbot added this to the 1.61.0 milestone Apr 1, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yaahc yaahc yaahc left review comments

@ChrisDenton ChrisDenton ChrisDenton left review comments

Assignees

@yaahc yaahc

Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.61.0
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@m-ou-se @rust-highfive @yaahc @bors @Dylan-DPC @ChrisDenton @rustbot