diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2021-03-21 02:01:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-21 02:01:36 +0100 |
| commit | 118aba359b0f467d64c12280d57081e72bde0866 (patch) | |
| tree | 0998ac4c5e999545e727765546f364f0a7770407 /compiler/rustc_codegen_ssa/src | |
| parent | 3a113f18f8f2a9b99ae0212b5a27bd56a24655c3 (diff) | |
| parent | 2885ca3cce4b0ca44dce0d4ed02115498c369595 (diff) | |
| download | rust-118aba359b0f467d64c12280d57081e72bde0866.tar.gz rust-118aba359b0f467d64c12280d57081e72bde0866.zip | |
Rollup merge of #83040 - lcnr:unused-ct-substs, r=oli-obk
extract `ConstKind::Unevaluated` into a struct r? `@oli-obk`
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 |