mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Rollup merge of #76172 - ecstatic-morse:revert-75463, r=RalfJung

Browse source 
Revert #75463

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

r? @RalfJung
This commit is contained in:
Tyler Mandry 2020-08-31 19:18:29 -07:00 • committed by GitHub
commit 9d435d2543
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
library/core/src/cmp.rs
View file

@ -356,9 +356,8 @@ impl Ordering {
/// ```
#[inline]
#[must_use]
#[rustc_const_stable(feature = "const_ordering", since = "1.48.0")]
#[stable(feature = "rust1", since = "1.0.0")]
pub const fn reverse(self) -> Ordering {
pub fn reverse(self) -> Ordering {
match self {
Less => Greater,
Equal => Equal,
@ -395,9 +394,8 @@ impl Ordering {
/// ```
#[inline]
#[must_use]
#[rustc_const_stable(feature = "const_ordering", since = "1.48.0")]
#[stable(feature = "ordering_chaining", since = "1.17.0")]
pub const fn then(self, other: Ordering) -> Ordering {
pub fn then(self, other: Ordering) -> Ordering {
match self {
Equal => other,
_ => self,

15
src/test/ui/consts/const-ordering.rs
View file

@ -1,15 +0,0 @@
// run-pass
use std::cmp::Ordering;
// the following methods of core::cmp::Ordering are const:
// - reverse
// - then
fn main() {
const REVERSE : Ordering = Ordering::Greater.reverse();
assert_eq!(REVERSE, Ordering::Less);
const THEN : Ordering = Ordering::Equal.then(REVERSE);
assert_eq!(THEN, Ordering::Less);
}