diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2023-08-03 08:12:39 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-03 08:12:39 +0200 |
| commit | 01fdb9d148f2784cd04a4108cb1095b7b3d1e53a (patch) | |
| tree | c5222217e884d2ed2041b7e389866f6178a44618 /compiler/rustc_const_eval | |
| parent | d8bbef50bbad789e26219f4ec88b5d73b05570a3 (diff) | |
| parent | 2984670cea3ca625c2a64ce2604cfe2accbe9aa2 (diff) | |
| download | rust-01fdb9d148f2784cd04a4108cb1095b7b3d1e53a.tar.gz rust-01fdb9d148f2784cd04a4108cb1095b7b3d1e53a.zip | |
Rollup merge of #114363 - RalfJung:interpret-not-miri, r=jackh726
avoid 'miri' when refering to the shared interpreter This is basically the rustc source code version of https://github.com/rust-lang/rustc-dev-guide/pull/1471.
Diffstat (limited to 'compiler/rustc_const_eval')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/intrinsics.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/memory.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/intrinsics.rs b/compiler/rustc_const_eval/src/interpret/intrinsics.rs index 29f3e6c724b..123eb3125f0 100644 --- a/compiler/rustc_const_eval/src/interpret/intrinsics.rs +++ b/compiler/rustc_const_eval/src/interpret/intrinsics.rs @@ -1,4 +1,4 @@ -//! Intrinsics and other functions that the miri engine executes without +//! Intrinsics and other functions that the interpreter executes without //! looking at their MIR. Intrinsics/functions supported here are shared by CTFE //! and miri. 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 |
