From 4404cc5bc7c4b2e9f2f446bca0e59531c1bfce05 Mon Sep 17 00:00:00 2001
From: Dylan MacKenzie <ecstaticmorse@gmail.com>
Date: Mon, 31 Aug 2020 10:20:34 -0700
Subject: [PATCH] Revert #75463

This was approved by me prematurely. It needs T-libs approval.
---
 library/core/src/cmp.rs              |  6 ++----
 src/test/ui/consts/const-ordering.rs | 15 ---------------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 src/test/ui/consts/const-ordering.rs

diff --git a/library/core/src/cmp.rs b/library/core/src/cmp.rs
index dde442aa7b52d..3953c73319fe4 100644
--- a/library/core/src/cmp.rs
+++ b/library/core/src/cmp.rs
@@ -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,
diff --git a/src/test/ui/consts/const-ordering.rs b/src/test/ui/consts/const-ordering.rs
deleted file mode 100644
index 454f2da00df9e..0000000000000
--- a/src/test/ui/consts/const-ordering.rs
+++ /dev/null
@@ -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);
-}