Remove `fn` from feature name

10 files changed, 12 insertions, 12 deletions

diff --git a/compiler/rustc_feature/src/active.rs b/compiler/rustc_feature/src/active.rs
index 19da310b3b2..1982d098542 100644
--- a/compiler/rustc_feature/src/active.rs
+++ b/compiler/rustc_feature/src/active.rs
@@ -597,7 +597,7 @@ declare_features! (
     (active, default_alloc_error_handler, "1.48.0", Some(66741), None),
 
     /// Allows argument and return position `impl Trait` in a `const fn`.
-    (active, const_fn_impl_trait, "1.48.0", Some(77463), None),
+    (active, const_impl_trait, "1.48.0", Some(77463), None),
 
     // -------------------------------------------------------------------------
     // feature-group-end: actual feature gates
diff --git a/compiler/rustc_mir/src/transform/check_consts/ops.rs b/compiler/rustc_mir/src/transform/check_consts/ops.rs
index 91008f00930..e0570ab622e 100644
--- a/compiler/rustc_mir/src/transform/check_consts/ops.rs
+++ b/compiler/rustc_mir/src/transform/check_consts/ops.rs
@@ -562,14 +562,14 @@ pub mod ty {
             if ccx.const_kind() != hir::ConstContext::ConstFn {
                 Status::Allowed
             } else {
-                Status::Unstable(sym::const_fn_impl_trait)
+                Status::Unstable(sym::const_impl_trait)
             }
         }
 
         fn build_error(&self, ccx: &ConstCx<'_, 'tcx>, span: Span) -> DiagnosticBuilder<'tcx> {
             feature_err(
                 &ccx.tcx.sess.parse_sess,
-                sym::const_fn_impl_trait,
+                sym::const_impl_trait,
                 span,
                 &format!("`impl Trait` is not allowed in {}s", ccx.const_kind()),
             )
diff --git a/compiler/rustc_span/src/symbol.rs b/compiler/rustc_span/src/symbol.rs
index 123f1f76765..a2184c00a28 100644
--- a/compiler/rustc_span/src/symbol.rs
+++ b/compiler/rustc_span/src/symbol.rs
@@ -355,11 +355,11 @@ symbols! {
         const_fn,
         const_fn_floating_point_arithmetic,
         const_fn_fn_ptr_basics,
-        const_fn_impl_trait,
         const_fn_transmute,
         const_fn_union,
         const_generics,
         const_if_match,
+        const_impl_trait,
         const_in_array_repeat_expressions,
         const_indexing,
         const_let,
diff --git a/library/core/src/lib.rs b/library/core/src/lib.rs
index d96e82f1d5e..3aa68aa1d8d 100644
--- a/library/core/src/lib.rs
+++ b/library/core/src/lib.rs
@@ -83,7 +83,7 @@
 #![feature(const_fn)]
 #![feature(const_fn_union)]
 #![feature(const_assume)]
-#![cfg_attr(not(bootstrap), feature(const_fn_impl_trait))]
+#![cfg_attr(not(bootstrap), feature(const_impl_trait))]
 #![cfg_attr(not(bootstrap), feature(const_fn_floating_point_arithmetic))]
 #![cfg_attr(not(bootstrap), feature(const_fn_fn_ptr_basics))]
 #![feature(const_generics)]
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.rs b/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.rs
index a8642d18b56..e062c9f0aa3 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.rs
+++ b/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.rs
@@ -1,4 +1,4 @@
-// gate-test-const_fn_impl_trait
+// gate-test-const_impl_trait
 
 struct AlanTuring<T>(T);
 const fn no_rpit2() -> AlanTuring<impl std::fmt::Debug> { //~ `impl Trait`
diff --git a/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.stderr b/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.stderr
index 1a49b59733d..01c797cd96b 100644
--- a/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.stderr
+++ b/src/test/ui/consts/min_const_fn/min_const_fn_impl_trait.stderr
@@ -5,7 +5,7 @@ LL | const fn no_rpit2() -> AlanTuring<impl std::fmt::Debug> {
    |                        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: see issue #77463 <https://github.com/rust-lang/rust/issues/77463> for more information
-   = help: add `#![feature(const_fn_impl_trait)]` to the crate attributes to enable
+   = help: add `#![feature(const_impl_trait)]` to the crate attributes to enable
 
 error[E0658]: `impl Trait` is not allowed in constant functions
   --> $DIR/min_const_fn_impl_trait.rs:8:23
@@ -14,7 +14,7 @@ LL | const fn no_rpit() -> impl std::fmt::Debug {}
    |                       ^^^^^^^^^^^^^^^^^^^^
    |
    = note: see issue #77463 <https://github.com/rust-lang/rust/issues/77463> for more information
-   = help: add `#![feature(const_fn_impl_trait)]` to the crate attributes to enable
+   = help: add `#![feature(const_impl_trait)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/type-alias-impl-trait/issue-53096.rs b/src/test/ui/type-alias-impl-trait/issue-53096.rs
index 1d9b56835a2..6e1973bd18a 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53096.rs
+++ b/src/test/ui/type-alias-impl-trait/issue-53096.rs
@@ -1,5 +1,5 @@
 // check-pass
-#![feature(const_fn_impl_trait, const_fn_fn_ptr_basics)]
+#![feature(const_impl_trait, const_fn_fn_ptr_basics)]
 #![feature(type_alias_impl_trait)]
 
 type Foo = impl Fn() -> usize;
diff --git a/src/test/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.rs b/src/test/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.rs
index eaba1ade0e1..4582d5386f0 100644
--- a/src/test/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.rs
+++ b/src/test/ui/type-alias-impl-trait/issue-53678-generator-and-const-fn.rs
@@ -1,6 +1,6 @@
 // check-pass
 
-#![feature(const_fn_impl_trait, generators, generator_trait, type_alias_impl_trait)]
+#![feature(const_impl_trait, generators, generator_trait, type_alias_impl_trait)]
 
 use std::ops::Generator;
 
diff --git a/src/test/ui/type-alias-impl-trait/structural-match-no-leak.rs b/src/test/ui/type-alias-impl-trait/structural-match-no-leak.rs
index e0bf5762b4a..58f0f5b2f65 100644
--- a/src/test/ui/type-alias-impl-trait/structural-match-no-leak.rs
+++ b/src/test/ui/type-alias-impl-trait/structural-match-no-leak.rs
@@ -1,4 +1,4 @@
-#![feature(const_fn_impl_trait, type_alias_impl_trait)]
+#![feature(const_impl_trait, type_alias_impl_trait)]
 
 type Bar = impl Send;
 
diff --git a/src/test/ui/type-alias-impl-trait/structural-match.rs b/src/test/ui/type-alias-impl-trait/structural-match.rs
index 9cedcd4ae48..74ffa608426 100644
--- a/src/test/ui/type-alias-impl-trait/structural-match.rs
+++ b/src/test/ui/type-alias-impl-trait/structural-match.rs
@@ -1,4 +1,4 @@
-#![feature(const_fn_impl_trait, type_alias_impl_trait)]
+#![feature(const_impl_trait, type_alias_impl_trait)]
 
 type Foo = impl Send;