user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename const_eval::Evaluator to CompileTimeFunctionEvaluator

Browse source
This commit is contained in:
Oliver Schneider 2017-07-25 15:22:52 +02:00
parent 4a4640a331
commit 960dca172d
No known key found for this signature in database
GPG key ID: A69F8D225B3AD7D9
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/librustc_mir/interpret/const_eval.rs
View file

@ -21,7 +21,7 @@ pub fn eval_body_as_primval<'a, 'tcx>(
instance: Instance<'tcx>,
) -> EvalResult<'tcx, (PrimVal, Ty<'tcx>)> {
let limits = super::ResourceLimits::default();
let mut ecx = EvalContext::<Evaluator>::new(tcx, limits, (), ());
let mut ecx = EvalContext::<CompileTimeFunctionEvaluator>::new(tcx, limits, (), ());
let cid = GlobalId { instance, promoted: None };
if ecx.tcx.has_attr(instance.def_id(), "linkage") {
return Err(ConstEvalError::NotConst("extern global".to_string()).into());
@ -82,7 +82,7 @@ pub fn eval_body_as_integer<'a, 'tcx>(
})
}
struct Evaluator;
struct CompileTimeFunctionEvaluator;
impl<'tcx> Into<EvalError<'tcx>> for ConstEvalError {
fn into(self) -> EvalError<'tcx> {
@ -124,7 +124,7 @@ impl Error for ConstEvalError {
}
}
impl<'tcx> super::Machine<'tcx> for Evaluator {
impl<'tcx> super::Machine<'tcx> for CompileTimeFunctionEvaluator {
type Data = ();
type MemoryData = ();
fn call_missing_fn<'a>(