diff options
| author | bors <bors@rust-lang.org> | 2022-05-11 13:47:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-11 13:47:38 +0000 |
| commit | 08b4f1be33607fc4f18ce19cfd475ac9f43213fc (patch) | |
| tree | 7b063605700341d78ea936146f2cf47c3081e950 /compiler/rustc_const_eval/src | |
| parent | a85de162a513d1d11d263783a3f7092fff824b48 (diff) | |
| parent | cf1d52f9cceda0e0adc79088d4de186f63e6c81a (diff) | |
| download | rust-08b4f1be33607fc4f18ce19cfd475ac9f43213fc.tar.gz rust-08b4f1be33607fc4f18ce19cfd475ac9f43213fc.zip | |
Auto merge of #96942 - Dylan-DPC:rollup-p8bcly2, r=Dylan-DPC
Rollup of 4 pull requests Successful merges: - #91518 (Add readable rustdoc display for RISC-V target) - #95281 (Fix inaccurate function name in `rustc_const_eval` docs) - #96898 (logging: add env var to control verbose scope entry/exit logging) - #96936 (:arrow_up: rust-analyzer) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/operand.rs | 4 | ||||
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/place.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/operand.rs b/compiler/rustc_const_eval/src/interpret/operand.rs index a8a5ac2f9d9..8926676e815 100644 --- a/compiler/rustc_const_eval/src/interpret/operand.rs +++ b/compiler/rustc_const_eval/src/interpret/operand.rs @@ -520,8 +520,8 @@ impl<'mir, 'tcx: 'mir, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> { Ok(OpTy { op, layout: place.layout }) } - // Evaluate a place with the goal of reading from it. This lets us sometimes - // avoid allocations. + /// Evaluate a place with the goal of reading from it. This lets us sometimes + /// avoid allocations. pub fn eval_place_to_op( &self, place: mir::Place<'tcx>, diff --git a/compiler/rustc_const_eval/src/interpret/place.rs b/compiler/rustc_const_eval/src/interpret/place.rs index df6e05bb13c..e23c6f2a954 100644 --- a/compiler/rustc_const_eval/src/interpret/place.rs +++ b/compiler/rustc_const_eval/src/interpret/place.rs @@ -625,7 +625,7 @@ where } /// Computes a place. You should only use this if you intend to write into this - /// place; for reading, a more efficient alternative is `eval_place_for_read`. + /// place; for reading, a more efficient alternative is `eval_place_to_op`. #[instrument(skip(self), level = "debug")] pub fn eval_place( &mut self, |