Remove the special treatment of the const_cmp and const_trait_impl features

Author: jakubadamw

compiler/rustc_mir_build/src/builder/matches/match_pair.rs

@@ -5,7 +5,6 @@ use rustc_middle::mir::*;
 use rustc_middle::span_bug;
 use rustc_middle::thir::*;
 use rustc_middle::ty::{self, Ty, TyCtxt, TypeVisitableExt};
-use rustc_span::sym;
 
 use crate::builder::Builder;
 use crate::builder::expr::as_place::{PlaceBase, PlaceBuilder};
@@ -47,16 +46,11 @@ fn try_reconstruct_aggregate_constant<'tcx>(
 
 impl<'a, 'tcx> Builder<'a, 'tcx> {
     /// Check if we can use aggregate `PartialEq::eq` comparisons for constant array/slice patterns.
-    /// This is not possible in const contexts unless `#![feature(const_cmp, const_trait_impl)]` are enabled,
-    /// because `PartialEq` is not const-stable.
+    /// This is not possible in const contexts, because `PartialEq` is not const-stable yet.
     fn can_use_aggregate_eq(&self) -> bool {
-        let const_partial_eq_enabled = {
-            let features = self.tcx.features();
-            features.enabled(sym::const_trait_impl) && features.enabled(sym::const_cmp)
-        };
         let in_const_context = self.tcx.is_const_fn(self.def_id.to_def_id())
             || !self.tcx.hir_body_owner_kind(self.def_id).is_fn_or_closure();
-        !in_const_context || const_partial_eq_enabled
+        !in_const_context
     }
 }
 

compiler/rustc_span/src/symbol.rs

@@ -648,7 +648,6 @@ symbols! {
         const_block_items,
         const_c_variadic,
         const_closures,
-        const_cmp,
         const_compare_raw_pointers,
         const_constructor,
         const_continue,

tests/mir-opt/building/match/aggregate_array_eq.rs

@@ -4,7 +4,7 @@
 // Verify that matching against a constant array pattern produces a single
 // `PartialEq::eq` call rather than element-by-element comparisons.
 // In const contexts, the aggregate comparison must NOT be used because
-// `PartialEq` is not const-stable (unless `#![feature(const_cmp)]`).
+// `PartialEq` is not const-stable.
 
 #![crate_type = "lib"]