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/intrinsics.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/intrinsics.rs')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/intrinsics.rs | 2 |
1 files changed, 1 insertions, 1 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. |