diff options
| author | bors <bors@rust-lang.org> | 2025-05-17 16:28:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-05-17 16:28:16 +0000 |
| commit | bf5a38d118a46fb5fdff90e3dc3cbb58fe618c46 (patch) | |
| tree | 56a95707530044382d6802e830aad804ca1e16ee /compiler/rustc_const_eval/src/interpret/call.rs | |
| parent | 2c12b4a690c8201a3c79f404eec38614684c412c (diff) | |
| parent | 339a46cb727842127eab6212ab13fbb620785312 (diff) | |
| download | rust-bf5a38d118a46fb5fdff90e3dc3cbb58fe618c46.tar.gz rust-bf5a38d118a46fb5fdff90e3dc3cbb58fe618c46.zip | |
Auto merge of #141133 - matthiaskrgr:rollup-u8ndxyz, r=matthiaskrgr
Rollup of 9 pull requests Successful merges: - #135808 (Implement Display for ``rustc_target::callconv::Conv``) - #137432 (Add as_ascii_unchecked() methods to char, u8, and str) - #139103 (deduplicate abort implementations) - #140917 (checktools.sh: fix bashism) - #141035 (turn lld warning on old gccs into info log) - #141118 (Enable rust-analyzer to go from query definition to the corresponding provider field) - #141121 (Only select true errors in `impossible_predicates`) - #141125 (check coroutines with `TypingMode::Borrowck` to avoid cyclic reasoning) - #141131 (Make some `match`es slightly more ergonomic in `librustdoc`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_const_eval/src/interpret/call.rs')
| -rw-r--r-- | compiler/rustc_const_eval/src/interpret/call.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_const_eval/src/interpret/call.rs b/compiler/rustc_const_eval/src/interpret/call.rs index 216800717fd..405208e94f4 100644 --- a/compiler/rustc_const_eval/src/interpret/call.rs +++ b/compiler/rustc_const_eval/src/interpret/call.rs @@ -353,8 +353,8 @@ impl<'tcx, M: Machine<'tcx>> InterpCx<'tcx, M> { if caller_fn_abi.conv != callee_fn_abi.conv { throw_ub_custom!( fluent::const_eval_incompatible_calling_conventions, - callee_conv = format!("{:?}", callee_fn_abi.conv), - caller_conv = format!("{:?}", caller_fn_abi.conv), + callee_conv = format!("{}", callee_fn_abi.conv), + caller_conv = format!("{}", caller_fn_abi.conv), ) } |