diff options
| author | bors <bors@rust-lang.org> | 2024-11-27 02:13:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-11-27 02:13:49 +0000 |
| commit | 48696f5bd64f58e1a3d98ccb2a801e079ddef30b (patch) | |
| tree | 28487c9ce9fa4a889da79119d17b4713202c624a /compiler/rustc_const_eval/src/interpret | |
| parent | dd2837ec5de4301a692e05a7c4475e980af57a57 (diff) | |
| parent | 702996c31bf142787a30a0adcff8f098177ca1a3 (diff) | |
| download | rust-48696f5bd64f58e1a3d98ccb2a801e079ddef30b.tar.gz rust-48696f5bd64f58e1a3d98ccb2a801e079ddef30b.zip | |
Auto merge of #133516 - compiler-errors:rollup-mq334h8, r=compiler-errors
Rollup of 8 pull requests Successful merges: - #115293 (Remove -Zfuel.) - #132605 (CI: increase timeout from 4h to 6h) - #133304 (Revert diagnostics hack to fix ICE 132920) - #133402 (Constify `Drop` and `Destruct`) - #133458 (Fix `Result` and `Option` not getting a jump to def link generated) - #133471 (gce: fix typing_mode mismatch) - #133475 (`MaybeStorage` improvements) - #133513 (Only ignore windows-gnu in avr-jmp-offset) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src/interpret')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/stack.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/stack.rs b/compiler/rustc_const_eval/src/interpret/stack.rs index 8ce11c71b8b..a9ebf386617 100644 --- a/compiler/rustc_const_eval/src/interpret/stack.rs +++ b/compiler/rustc_const_eval/src/interpret/stack.rs @@ -10,7 +10,7 @@ use rustc_index::IndexVec; use rustc_middle::ty::layout::{LayoutOf, TyAndLayout}; use rustc_middle::ty::{self, Ty, TyCtxt}; use rustc_middle::{bug, mir}; -use rustc_mir_dataflow::storage::always_storage_live_locals; +use rustc_mir_dataflow::impls::always_storage_live_locals; use rustc_span::Span; use tracing::{info_span, instrument, trace}; |