diff options
| author | bors <bors@rust-lang.org> | 2021-05-27 01:43:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-05-27 01:43:20 +0000 |
| commit | c4ec606606850a5a3eba31da88ccd338ee8e8da5 (patch) | |
| tree | 9a7cea3984d8baef4c6392f7cbdb5e61f1f86bec /compiler/rustc_mir | |
| parent | 86ac0b4147822e23c671a40e7ba1bf5b5835150d (diff) | |
| parent | 85a408a043818bb72100cbb2750599e6d1b236c1 (diff) | |
| download | rust-c4ec606606850a5a3eba31da88ccd338ee8e8da5.tar.gz rust-c4ec606606850a5a3eba31da88ccd338ee8e8da5.zip | |
Auto merge of #85734 - Dylan-DPC:rollup-q6iiees, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #84221 (E0599 suggestions and elision of generic argument if no canditate is found) - #84701 (stabilize member constraints) - #85564 ( readd capture disjoint fields gate) - #85583 (Get rid of PreviousDepGraph.) - #85649 (Update cc) - #85689 (Remove Iterator #[rustc_on_unimplemented]s that no longer apply.) - #85719 (Add inline attr to CString::into_inner so it can optimize out NonNull checks) - #85725 (Remove unneeded workaround) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_mir')
| -rw-r--r-- | compiler/rustc_mir/src/interpret/place.rs | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/compiler/rustc_mir/src/interpret/place.rs b/compiler/rustc_mir/src/interpret/place.rs index 79aaff1c5eb..4c53510ed00 100644 --- a/compiler/rustc_mir/src/interpret/place.rs +++ b/compiler/rustc_mir/src/interpret/place.rs @@ -15,9 +15,9 @@ use rustc_target::abi::{Abi, Align, FieldsShape, TagEncoding}; use rustc_target::abi::{HasDataLayout, LayoutOf, Size, VariantIdx, Variants}; use super::{ - alloc_range, mir_assign_valid_types, AllocId, AllocMap, AllocRef, AllocRefMut, Allocation, - ConstAlloc, ImmTy, Immediate, InterpCx, InterpResult, LocalValue, Machine, MemoryKind, OpTy, - Operand, Pointer, PointerArithmetic, Scalar, ScalarMaybeUninit, + alloc_range, mir_assign_valid_types, AllocRef, AllocRefMut, ConstAlloc, ImmTy, Immediate, + InterpCx, InterpResult, LocalValue, Machine, MemoryKind, OpTy, Operand, Pointer, + PointerArithmetic, Scalar, ScalarMaybeUninit, }; #[derive(Copy, Clone, Debug, Hash, PartialEq, Eq, HashStable)] @@ -292,8 +292,6 @@ where // FIXME: Working around https://github.com/rust-lang/rust/issues/54385 Tag: Debug + Copy + Eq + Hash + 'static, M: Machine<'mir, 'tcx, PointerTag = Tag>, - // FIXME: Working around https://github.com/rust-lang/rust/issues/24159 - M::MemoryMap: AllocMap<AllocId, (MemoryKind<M::MemoryKind>, Allocation<Tag, M::AllocExtra>)>, { /// Take a value, which represents a (thin or wide) reference, and make it a place. /// Alignment is just based on the type. This is the inverse of `MemPlace::to_ref()`. |