From 89fc3fb93b0befd5515917289564a297c49bba6e Mon Sep 17 00:00:00 2001 From: CDirkx Date: Sun, 30 Aug 2020 23:48:54 +0200 Subject: [PATCH] Stabilize feature `const_ordering` --- library/core/src/cmp.rs | 4 ++-- library/core/src/lib.rs | 1 - src/test/ui/consts/const-ordering.rs | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/library/core/src/cmp.rs b/library/core/src/cmp.rs index ddc9f7b8cba..1060fc04071 100644 --- a/library/core/src/cmp.rs +++ b/library/core/src/cmp.rs @@ -356,7 +356,7 @@ impl Ordering { /// ``` #[inline] #[must_use] - #[rustc_const_unstable(feature = "const_ordering", issue = "76113")] + #[rustc_const_stable(feature = "const_ordering", since = "1.47.0")] #[stable(feature = "rust1", since = "1.0.0")] pub const fn reverse(self) -> Ordering { match self { @@ -395,7 +395,7 @@ impl Ordering { /// ``` #[inline] #[must_use] - #[rustc_const_unstable(feature = "const_ordering", issue = "76113")] + #[rustc_const_stable(feature = "const_ordering", since = "1.47.0")] #[stable(feature = "ordering_chaining", since = "1.17.0")] pub const fn then(self, other: Ordering) -> Ordering { match self { diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs index 745c46e0868..fcf5454308b 100644 --- a/library/core/src/lib.rs +++ b/library/core/src/lib.rs @@ -86,7 +86,6 @@ #![feature(const_ptr_offset_from)] #![feature(const_raw_ptr_comparison)] #![feature(const_result)] -#![feature(const_ordering)] #![feature(const_slice_from_raw_parts)] #![feature(const_slice_ptr_len)] #![feature(const_size_of_val)] diff --git a/src/test/ui/consts/const-ordering.rs b/src/test/ui/consts/const-ordering.rs index 9feb2b27dad..454f2da00df 100644 --- a/src/test/ui/consts/const-ordering.rs +++ b/src/test/ui/consts/const-ordering.rs @@ -1,7 +1,5 @@ // run-pass -#![feature(const_ordering)] - use std::cmp::Ordering; // the following methods of core::cmp::Ordering are const: