bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Reflect the "do not call this query directly" mentality in its name

Browse source
This commit is contained in:
Oliver Scherer 2020-09-19 10:57:14 +02:00
parent c5889e4dab
commit b8e6883a2f
6 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_mir/src/const_eval/eval_queries.rs
View file

@ -200,13 +200,13 @@ fn turn_into_const_value<'tcx>(
);
assert!(
!is_static || cid.promoted.is_some(),
"the `eval_to_const_value` query should not be used for statics, use `eval_to_allocation` instead"
"the `eval_to_const_value_raw` query should not be used for statics, use `eval_to_allocation` instead"
);
// Turn this into a proper constant.
op_to_const(&ecx, mplace.into())
}
pub fn eval_to_const_value_provider<'tcx>(
pub fn eval_to_const_value_raw_provider<'tcx>(
tcx: TyCtxt<'tcx>,
key: ty::ParamEnvAnd<'tcx, GlobalId<'tcx>>,
) -> ::rustc_middle::mir::interpret::EvalToConstValueResult<'tcx> {
@ -214,7 +214,7 @@ pub fn eval_to_const_value_provider<'tcx>(
if key.param_env.reveal() == Reveal::All {
let mut key = key;
key.param_env = key.param_env.with_user_facing();
match tcx.eval_to_const_value(key) {
match tcx.eval_to_const_value_raw(key) {
// try again with reveal all as requested
Err(ErrorHandled::TooGeneric) => {}
// deduplicate calls