diff options
| author | lcnr <rust@lcnr.de> | 2021-03-13 16:31:38 +0100 |
|---|---|---|
| committer | lcnr <rust@lcnr.de> | 2021-03-20 17:22:24 +0100 |
| commit | 7c9b5b4ce03c84f4c48ca39c96ff7ff20df0daad (patch) | |
| tree | 2c83d63981b6eeb7d592badb577c18d8a98205ca /compiler/rustc_middle/src/mir | |
| parent | 43ebac119b853de626fcc9afb49c5b0544731141 (diff) | |
| download | rust-7c9b5b4ce03c84f4c48ca39c96ff7ff20df0daad.tar.gz rust-7c9b5b4ce03c84f4c48ca39c96ff7ff20df0daad.zip | |
update `const_eval_resolve`
Diffstat (limited to 'compiler/rustc_middle/src/mir')
| -rw-r--r-- | compiler/rustc_middle/src/mir/interpret/queries.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/compiler/rustc_middle/src/mir/interpret/queries.rs b/compiler/rustc_middle/src/mir/interpret/queries.rs index 3e7b93b32a6..fa7c0670e8c 100644 --- a/compiler/rustc_middle/src/mir/interpret/queries.rs +++ b/compiler/rustc_middle/src/mir/interpret/queries.rs @@ -1,7 +1,7 @@ use super::{ErrorHandled, EvalToConstValueResult, GlobalId}; use crate::mir; -use crate::ty::subst::{InternalSubsts, SubstsRef}; +use crate::ty::subst::InternalSubsts; use crate::ty::{self, TyCtxt}; use rustc_hir::def_id::DefId; use rustc_span::Span; @@ -35,14 +35,12 @@ impl<'tcx> TyCtxt<'tcx> { pub fn const_eval_resolve( self, param_env: ty::ParamEnv<'tcx>, - def: ty::WithOptConstParam<DefId>, - substs: SubstsRef<'tcx>, - promoted: Option<mir::Promoted>, + ct: ty::Unevaluated<'tcx>, span: Option<Span>, ) -> EvalToConstValueResult<'tcx> { - match ty::Instance::resolve_opt_const_arg(self, param_env, def, substs) { + match ty::Instance::resolve_opt_const_arg(self, param_env, ct.def, ct.substs) { Ok(Some(instance)) => { - let cid = GlobalId { instance, promoted }; + let cid = GlobalId { instance, promoted: ct.promoted }; self.const_eval_global_id(param_env, cid, span) } Ok(None) => Err(ErrorHandled::TooGeneric), |
