diff options
| author | bors <bors@rust-lang.org> | 2022-01-03 14:30:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-01-03 14:30:36 +0000 |
| commit | ddabe0775c5f5b551d5eb54e3c4366fb8bec0c92 (patch) | |
| tree | 710c45c1ed562d6bc165be9a3664a2cfb6f8f20a /compiler/rustc_mir_transform/src | |
| parent | b5efe5727f5db54412cf2995d14def91140a5a42 (diff) | |
| parent | 13e284033e34609f5f911d3df989eddec4af3f1b (diff) | |
| download | rust-ddabe0775c5f5b551d5eb54e3c4366fb8bec0c92.tar.gz rust-ddabe0775c5f5b551d5eb54e3c4366fb8bec0c92.zip | |
Auto merge of #92518 - matthiaskrgr:rollup-fl8z4e7, r=matthiaskrgr
Rollup of 6 pull requests Successful merges: - #90102 (Remove `NullOp::Box`) - #92011 (Use field span in `rustc_macros` when emitting decode call) - #92402 (Suggest while let x = y when encountering while x = y) - #92409 (Couple of libtest cleanups) - #92418 (Fix spacing in pretty printed PatKind::Struct with no fields) - #92444 (Consolidate Result's and Option's methods into fewer impl blocks) Failed merges: - #92483 (Stabilize `result_cloned` and `result_copied`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir_transform/src')
| -rw-r--r-- | compiler/rustc_mir_transform/src/const_prop.rs | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/compiler/rustc_mir_transform/src/const_prop.rs b/compiler/rustc_mir_transform/src/const_prop.rs index 7e56e062fc9..ecc8e7a6f1a 100644 --- a/compiler/rustc_mir_transform/src/const_prop.rs +++ b/compiler/rustc_mir_transform/src/const_prop.rs @@ -239,13 +239,6 @@ impl<'mir, 'tcx> interpret::Machine<'mir, 'tcx> for ConstPropMachine<'mir, 'tcx> throw_machine_stop_str!("pointer arithmetic or comparisons aren't supported in ConstProp") } - fn box_alloc( - _ecx: &mut InterpCx<'mir, 'tcx, Self>, - _dest: &PlaceTy<'tcx>, - ) -> InterpResult<'tcx> { - throw_machine_stop_str!("can't const prop heap allocations") - } - fn access_local( _ecx: &InterpCx<'mir, 'tcx, Self>, frame: &Frame<'mir, 'tcx, Self::PointerTag, Self::FrameExtra>, |
