diff options
| author | bors <bors@rust-lang.org> | 2021-03-21 03:36:22 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-03-21 03:36:22 +0000 |
| commit | bbf07c0b4f210ced7bd2785ab554e0d805644235 (patch) | |
| tree | bdaa957d4632277cb8db05193f7e9b5caf7ac5a8 /compiler/rustc_codegen_ssa/src | |
| parent | ed4005da44b0dcbeaa35951ef994da82e156258f (diff) | |
| parent | 69f6a195da5f7ed66bfde728f3feafdc621a6460 (diff) | |
| download | rust-bbf07c0b4f210ced7bd2785ab554e0d805644235.tar.gz rust-bbf07c0b4f210ced7bd2785ab554e0d805644235.zip | |
Auto merge of #83333 - Dylan-DPC:rollup-0rdt6sz, r=Dylan-DPC
Rollup of 6 pull requests Successful merges: - #82707 (const_evaluatable_checked: Stop eagerly erroring in `is_const_evaluatable`) - #83040 (extract `ConstKind::Unevaluated` into a struct) - #83280 (Fix pluralization in keyword docs) - #83289 (Move some tests to more reasonable directories - 5) - #83306 (Extend `proc_macro_back_compat` lint to `js-sys`) - #83327 (Extend comment in `UsedLocals::visit_lhs`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/mir/constant.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_codegen_ssa/src/mir/constant.rs b/compiler/rustc_codegen_ssa/src/mir/constant.rs index aa41acc3578..fa8a53e60b1 100644 --- a/compiler/rustc_codegen_ssa/src/mir/constant.rs +++ b/compiler/rustc_codegen_ssa/src/mir/constant.rs @@ -30,10 +30,10 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> { mir::ConstantKind::Val(val, _) => return Ok(val), }; match ct.val { - ty::ConstKind::Unevaluated(def, substs, promoted) => self + ty::ConstKind::Unevaluated(ct) => self .cx .tcx() - .const_eval_resolve(ty::ParamEnv::reveal_all(), def, substs, promoted, None) + .const_eval_resolve(ty::ParamEnv::reveal_all(), ct, None) .map_err(|err| { self.cx.tcx().sess.span_err(constant.span, "erroneous constant encountered"); err |