diff options
| author | bors <bors@rust-lang.org> | 2023-08-03 06:17:39 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-08-03 06:17:39 +0000 |
| commit | 2e6ac7fe5bb96bcc2d8c0b3e20db7cf7d2baa241 (patch) | |
| tree | dc05a311d9f6ed691dcdac94322950cf3755d3bd /compiler/rustc_const_eval/src/interpret/memory.rs | |
| parent | fb31b3c34ef4a67bcd5b1dad919dfaa4cab2c569 (diff) | |
| parent | 767a91d71ff42175d72a88a9231831d15b8566c4 (diff) | |
| download | rust-2e6ac7fe5bb96bcc2d8c0b3e20db7cf7d2baa241.tar.gz rust-2e6ac7fe5bb96bcc2d8c0b3e20db7cf7d2baa241.zip | |
Auto merge of #114400 - matthiaskrgr:rollup-1hkd1ay, r=matthiaskrgr
Rollup of 3 pull requests Successful merges: - #114363 (avoid 'miri' when refering to the shared interpreter) - #114371 (Add myself to mailmap) - #114387 (Temporarily eholk from review rotation) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src/interpret/memory.rs')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/memory.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/memory.rs b/compiler/rustc_const_eval/src/interpret/memory.rs index 940a312d03b..11bffedf54a 100644 --- a/compiler/rustc_const_eval/src/interpret/memory.rs +++ b/compiler/rustc_const_eval/src/interpret/memory.rs @@ -91,7 +91,7 @@ impl<'tcx, Other> FnVal<'tcx, Other> { // `Memory` has to depend on the `Machine` because some of its operations // (e.g., `get`) call a `Machine` hook. pub struct Memory<'mir, 'tcx, M: Machine<'mir, 'tcx>> { - /// Allocations local to this instance of the miri engine. The kind + /// Allocations local to this instance of the interpreter. The kind /// helps ensure that the same mechanism is used for allocation and /// deallocation. When an allocation is not found here, it is a /// global and looked up in the `tcx` for read access. Some machines may |