diff options
| author | bors <bors@rust-lang.org> | 2023-07-27 04:37:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-07-27 04:37:48 +0000 |
| commit | 3e11b223d7ad9836babf2d531b0ca6d13ff3f065 (patch) | |
| tree | e059cd720eda83b886aae647f815bed7590c3628 /compiler/rustc_const_eval/src/const_eval | |
| parent | d150dbb067e66f351a0b33a54e7d4b464ef51e47 (diff) | |
| parent | 8cae3439b098591c94215efb904be23ab042e39c (diff) | |
Auto merge of #114116 - matthiaskrgr:rollup-dtdfk76, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #113872 (Tweak CGU sorting in a couple of places.) - #114053 (CI: fix CMake installation for 32/64 bit `dist` Linux) - #114075 (inline format!() args from rustc_codegen_llvm to the end (4)) - #114081 (`desugar_doc_comments` cleanups) - #114082 (add stable NullaryOp) - #114098 (replace atty crate with std's IsTerminal) - #114102 (Dont pass `-Zwrite-long-types-to-disk=no` for `ui-fulldeps --stage=1`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src/const_eval')
| -rw-r--r-- | compiler/rustc_const_eval/src/const_eval/eval_queries.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_const_eval/src/const_eval/valtrees.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/const_eval/eval_queries.rs b/compiler/rustc_const_eval/src/const_eval/eval_queries.rs index 55d719d2703..c8e8a371105 100644 --- a/compiler/rustc_const_eval/src/const_eval/eval_queries.rs +++ b/compiler/rustc_const_eval/src/const_eval/eval_queries.rs @@ -52,7 +52,7 @@ fn eval_body_using_ecx<'mir, 'tcx>( trace!( "eval_body_using_ecx: pushing stack frame for global: {}{}", with_no_trimmed_paths!(ecx.tcx.def_path_str(cid.instance.def_id())), - cid.promoted.map_or_else(String::new, |p| format!("::promoted[{:?}]", p)) + cid.promoted.map_or_else(String::new, |p| format!("::promoted[{p:?}]")) ); ecx.push_stack_frame( diff --git a/compiler/rustc_const_eval/src/const_eval/valtrees.rs b/compiler/rustc_const_eval/src/const_eval/valtrees.rs index 744dd114ca7..7c1dbddfc26 100644 --- a/compiler/rustc_const_eval/src/const_eval/valtrees.rs +++ b/compiler/rustc_const_eval/src/const_eval/valtrees.rs @@ -55,7 +55,7 @@ fn slice_branches<'tcx>( place: &MPlaceTy<'tcx>, num_nodes: &mut usize, ) -> ValTreeCreationResult<'tcx> { - let n = place.len(ecx).unwrap_or_else(|_| panic!("expected to use len of place {:?}", place)); + let n = place.len(ecx).unwrap_or_else(|_| panic!("expected to use len of place {place:?}")); let mut elems = Vec::with_capacity(n as usize); for i in 0..n { |