Skip to content

Revert #75463 - #76172

Merged
bors merged 1 commit into
rust-lang:masterfrom
ecstatic-morse:revert-75463
Sep 1, 2020
Merged

Revert #75463#76172
bors merged 1 commit into
rust-lang:masterfrom
ecstatic-morse:revert-75463

Conversation

@ecstatic-morse

Copy link
Copy Markdown
Contributor

This was approved by me prematurely. It needs T-libs approval. Sorry @CDirkx.

r? @RalfJung

This was approved by me prematurely. It needs T-libs approval.
@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 31, 2020
@RalfJung

Copy link
Copy Markdown
Member

Thanks! @bors r+ rollup

@CDirkx To be clear, this change will most definitely go through when re-submitted. But it should be approved by the appropriate team and be subject to the 10-day comment period like every other stabilization. Once this PR lands, can you re-submit yours?

@bors

bors commented Aug 31, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 4404cc5 has been approved by RalfJung

@borsbors 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 31, 2020
@tmandrytmandry mentioned this pull request Sep 1, 2020
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 1, 2020
Rollup of 12 pull requests
Successful merges:
- rust-lang#75945 (Use `env::func()`, not 'the function env::func' in docs for std::env)
- rust-lang#76002 (Fix `-Z instrument-coverage` on MSVC)
- rust-lang#76003 (Adds two source span utility functions used in source-based coverage)
- rust-lang#76059 (Clean up E0764)
- rust-lang#76103 (Clean up E0769)
- rust-lang#76139 (Make `cow_is_borrowed` methods const)
- rust-lang#76154 (Fix rustdoc strings indentation)
- rust-lang#76161 (Remove notrust in rustc_middle)
- rust-lang#76163 (README: Adjust Linux and macOS support platform and architecture)
- rust-lang#76166 (Make `StringReader` private)
- rust-lang#76172 (Revert rust-lang#75463)
- rust-lang#76178 (Update expect-test to 1.0)
Failed merges:
r? @ghost
@bors
bors merged commit 9d435d2 into rust-lang:masterSep 1, 2020
@CDirkx

Copy link
Copy Markdown
Contributor

@RalfJung Of course, resubmitted the PR just now.

Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 15, 2020
Make some Ordering methods const
Resubmission of [PR#75463](rust-lang#75463) as per [PR#76172](rust-lang#76172).
Constify the following methods of `core::cmp::Ordering`:
- `reverse`
- `then`
Insta-stabilizes these methods as const under the `const_ordering` feature, as their implementation is a trivial match and the recent stabilization of rust-lang#49146 (Allow `if` and `match` in constants).
Note: the `const_ordering` feature has never actually been used as these methods have not been `#[rustc_const_unstable]`.
Tracking issue: rust-lang#76113
@ecstatic-morse
ecstatic-morse deleted the revert-75463 branch October 6, 2020 01:42
@cuvipercuviper added this to the 1.48.0 milestone Nov 17, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

6 participants

@ecstatic-morse@RalfJung@bors@CDirkx@cuviper@rust-highfive