Remove `fn` from feature name
This commit is contained in:
parent
af03b1143e
commit
c4ef5fdf8f
|
@ -597,7 +597,7 @@ declare_features! (
|
||||||
(active, default_alloc_error_handler, "1.48.0", Some(66741), None),
|
(active, default_alloc_error_handler, "1.48.0", Some(66741), None),
|
||||||
|
|
||||||
/// Allows argument and return position `impl Trait` in a `const fn`.
|
/// 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
|
// feature-group-end: actual feature gates
|
||||||
|
|
|
@ -562,14 +562,14 @@ pub mod ty {
|
||||||
if ccx.const_kind() != hir::ConstContext::ConstFn {
|
if ccx.const_kind() != hir::ConstContext::ConstFn {
|
||||||
Status::Allowed
|
Status::Allowed
|
||||||
} else {
|
} 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> {
|
fn build_error(&self, ccx: &ConstCx<'_, 'tcx>, span: Span) -> DiagnosticBuilder<'tcx> {
|
||||||
feature_err(
|
feature_err(
|
||||||
&ccx.tcx.sess.parse_sess,
|
&ccx.tcx.sess.parse_sess,
|
||||||
sym::const_fn_impl_trait,
|
sym::const_impl_trait,
|
||||||
span,
|
span,
|
||||||
&format!("`impl Trait` is not allowed in {}s", ccx.const_kind()),
|
&format!("`impl Trait` is not allowed in {}s", ccx.const_kind()),
|
||||||
)
|
)
|
||||||
|
|
|
@ -355,11 +355,11 @@ symbols! {
|
||||||
const_fn,
|
const_fn,
|
||||||
const_fn_floating_point_arithmetic,
|
const_fn_floating_point_arithmetic,
|
||||||
const_fn_fn_ptr_basics,
|
const_fn_fn_ptr_basics,
|
||||||
const_fn_impl_trait,
|
|
||||||
const_fn_transmute,
|
const_fn_transmute,
|
||||||
const_fn_union,
|
const_fn_union,
|
||||||
const_generics,
|
const_generics,
|
||||||
const_if_match,
|
const_if_match,
|
||||||
|
const_impl_trait,
|
||||||
const_in_array_repeat_expressions,
|
const_in_array_repeat_expressions,
|
||||||
const_indexing,
|
const_indexing,
|
||||||
const_let,
|
const_let,
|
||||||
|
|
|
@ -83,7 +83,7 @@
|
||||||
#![feature(const_fn)]
|
#![feature(const_fn)]
|
||||||
#![feature(const_fn_union)]
|
#![feature(const_fn_union)]
|
||||||
#![feature(const_assume)]
|
#![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_floating_point_arithmetic))]
|
||||||
#![cfg_attr(not(bootstrap), feature(const_fn_fn_ptr_basics))]
|
#![cfg_attr(not(bootstrap), feature(const_fn_fn_ptr_basics))]
|
||||||
#![feature(const_generics)]
|
#![feature(const_generics)]
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
// gate-test-const_fn_impl_trait
|
// gate-test-const_impl_trait
|
||||||
|
|
||||||
struct AlanTuring<T>(T);
|
struct AlanTuring<T>(T);
|
||||||
const fn no_rpit2() -> AlanTuring<impl std::fmt::Debug> { //~ `impl Trait`
|
const fn no_rpit2() -> AlanTuring<impl std::fmt::Debug> { //~ `impl Trait`
|
||||||
|
|
|
@ -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
|
= 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
|
error[E0658]: `impl Trait` is not allowed in constant functions
|
||||||
--> $DIR/min_const_fn_impl_trait.rs:8:23
|
--> $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
|
= 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
|
error: aborting due to 2 previous errors
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
// check-pass
|
// 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)]
|
#![feature(type_alias_impl_trait)]
|
||||||
|
|
||||||
type Foo = impl Fn() -> usize;
|
type Foo = impl Fn() -> usize;
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
// check-pass
|
// 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;
|
use std::ops::Generator;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
type Bar = impl Send;
|
||||||
|
|
||||||
|
|
|
@ -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;
|
type Foo = impl Send;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue