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

Revert #75463 This was approved by me prematurely. It needs T-libs approval. Sorry @CDirkx. r? @RalfJung
rust-lang · Sep 1, 2020 · 9d435d2 · 9d435d2
2 parents 90e4bfa + 4404cc5
commit 9d435d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 19 deletions.
diff --git 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