bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Fall back to being const-unstable when undeclared

Browse source
This commit is contained in:
Jacob Pratt 2022-02-04 19:03:34 -05:00 • committed by Oli Scherer
parent 6913c7487e
commit f53fc41cfc
1 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/rustc_const_eval/src/transform/check_consts/mod.rs
View file

@ -84,7 +84,7 @@ pub fn rustc_allow_const_fn_unstable(
// functions are subject to more stringent restrictions than "const-unstable" functions: They // functions are subject to more stringent restrictions than "const-unstable" functions: They
// cannot use unstable features and can only call other "const-stable" functions. // cannot use unstable features and can only call other "const-stable" functions.
pub fn is_const_stable_const_fn(tcx: TyCtxt<'_>, def_id: DefId) -> bool { pub fn is_const_stable_const_fn(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
use attr::{ConstStability, Stability, StabilityLevel}; use attr::{ConstStability, StabilityLevel};
// A default body marked const is not const-stable because const // A default body marked const is not const-stable because const
// trait fns currently cannot be const-stable. We shouldn't // trait fns currently cannot be const-stable. We shouldn't
@ -96,22 +96,9 @@ pub fn is_const_stable_const_fn(tcx: TyCtxt<'_>, def_id: DefId) -> bool {
// Const-stability is only relevant for `const fn`. // Const-stability is only relevant for `const fn`.
assert!(tcx.is_const_fn_raw(def_id)); assert!(tcx.is_const_fn_raw(def_id));
// Functions with `#[rustc_const_unstable]` are const-unstable. // A function is only const-stable if it has `#[rustc_const_stable]`.
match tcx.lookup_const_stability(def_id) { matches!(
Some(ConstStability { level: StabilityLevel::Unstable { .. }, .. }) => return false, tcx.lookup_const_stability(def_id),
Some(ConstStability { level: StabilityLevel::Stable { .. }, .. }) => return true, Some(ConstStability { level: StabilityLevel::Stable { .. }, .. })
None => {} )
}
// Functions with `#[unstable]` are const-unstable.
//
// FIXME(ecstaticmorse): We should keep const-stability attributes wholly separate from normal stability
// attributes. `#[unstable]` should be irrelevant.
if let Some(Stability { level: StabilityLevel::Unstable { .. }, .. }) =
tcx.lookup_stability(def_id)
{
return false;
}
true
} }