diff options
| author | bors <bors@rust-lang.org> | 2023-09-21 12:04:33 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-09-21 12:04:33 +0000 |
| commit | 66ab7e6883c563ceacf8386a50e851e9855cd6b4 (patch) | |
| tree | c8206b6a97130fb396796c98f7bb9a1cd3df77df /compiler/rustc_const_eval/src/interpret/operand.rs | |
| parent | e4a361a48a59ead52b302aaa2e1d9d345264935a (diff) | |
| parent | e9aee820b310e82c7c86ecd7fd931c6f3c51350f (diff) | |
| download | rust-66ab7e6883c563ceacf8386a50e851e9855cd6b4.tar.gz rust-66ab7e6883c563ceacf8386a50e851e9855cd6b4.zip | |
Auto merge of #116027 - GuillaumeGomez:rollup-3zdi9lf, r=GuillaumeGomez
Rollup of 5 pull requests Successful merges: - #115257 (Improve invalid UTF-8 lint by finding the expression initializer) - #115936 (Prevent promotion of const fn calls in inline consts) - #115972 (rename mir::Constant -> mir::ConstOperand, mir::ConstKind -> mir::Const) - #116007 (Call panic_display directly in const_panic_fmt.) - #116019 (Delete obsolete `--disable-per-crate-search` rustdoc flag) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src/interpret/operand.rs')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/operand.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/operand.rs b/compiler/rustc_const_eval/src/interpret/operand.rs index fdda98a50e8..d4f3929e68e 100644 --- a/compiler/rustc_const_eval/src/interpret/operand.rs +++ b/compiler/rustc_const_eval/src/interpret/operand.rs @@ -692,7 +692,7 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { Constant(constant) => { let c = - self.subst_from_current_frame_and_normalize_erasing_regions(constant.literal)?; + self.subst_from_current_frame_and_normalize_erasing_regions(constant.const_)?; // This can still fail: // * During ConstProp, with `TooGeneric` or since the `required_consts` were not all |