diff options
| author | bors <bors@rust-lang.org> | 2022-10-30 08:52:35 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-10-30 08:52:35 +0000 |
| commit | 962bf63dbfcb190bd752e2dbff7d133ab1101f5c (patch) | |
| tree | 0d0567de3defda59316b51e53e7687b36025df6f /compiler/rustc_const_eval/src/interpret/machine.rs | |
| parent | c162fd36d250f1a76e00ffa55b9d827d0db7e0bc (diff) | |
| parent | 0b49a5d17354c3b0980c3148f8291e429fc9a194 (diff) | |
| download | rust-962bf63dbfcb190bd752e2dbff7d133ab1101f5c.tar.gz rust-962bf63dbfcb190bd752e2dbff7d133ab1101f5c.zip | |
Auto merge of #2639 - RalfJung:rustup, r=RalfJung
Rustup
Diffstat (limited to 'compiler/rustc_const_eval/src/interpret/machine.rs')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/machine.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/machine.rs b/compiler/rustc_const_eval/src/interpret/machine.rs index 530e252b7c0..351152eba01 100644 --- a/compiler/rustc_const_eval/src/interpret/machine.rs +++ b/compiler/rustc_const_eval/src/interpret/machine.rs @@ -426,7 +426,7 @@ pub macro compile_time_machine(<$mir: lifetime, $tcx: lifetime>) { type ExtraFnVal = !; type MemoryMap = - rustc_data_structures::fx::FxHashMap<AllocId, (MemoryKind<Self::MemoryKind>, Allocation)>; + rustc_data_structures::fx::FxIndexMap<AllocId, (MemoryKind<Self::MemoryKind>, Allocation)>; const GLOBAL_KIND: Option<Self::MemoryKind> = None; // no copying of globals from `tcx` to machine memory type AllocExtra = (); |