Move is_const_fn to under TyCtxt

This commit is contained in:
Deadbeef 2021-09-15 10:03:03 +00:00
parent 1add837c91
commit 3e5f80f009
2 changed files with 1 additions and 2 deletions

View file

@ -18,7 +18,6 @@
extern crate rustc_ast;
extern crate rustc_ast_pretty;
extern crate rustc_attr;
extern crate rustc_const_eval;
extern crate rustc_data_structures;
extern crate rustc_errors;
extern crate rustc_hir;

View file

@ -364,7 +364,7 @@ fn check_terminator(
}
fn is_const_fn(tcx: TyCtxt<'_>, def_id: DefId, msrv: Option<&RustcVersion>) -> bool {
rustc_const_eval::const_eval::is_const_fn(tcx, def_id)
tcx.is_const_fn(def_id)
&& tcx.lookup_const_stability(def_id).map_or(true, |const_stab| {
if let rustc_attr::StabilityLevel::Stable { since } = const_stab.level {
// Checking MSRV is manually necessary because `rustc` has no such concept. This entire