Unify the names of const eval queries and their return types

2020-08-20 18:55:07 +02:00
parent 69a6be73e6
commit 888afd50d9
12 changed files with 38 additions and 36 deletions
--- a/compiler/rustc_mir/src/const_eval/machine.rs
+++ b/compiler/rustc_mir/src/const_eval/machine.rs
@@ -51,7 +51,7 @@ impl<'mir, 'tcx> InterpCx<'mir, 'tcx, CompileTimeInterpreter<'mir, 'tcx>> {

        let gid = GlobalId { instance, promoted: None };

-        let place = self.const_eval(gid)?;
+        let place = self.eval_to_allocation(gid)?;

        self.copy_op(place.into(), dest)?;