diff options
| author | bors <bors@rust-lang.org> | 2024-09-12 12:56:55 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-09-12 12:56:55 +0000 |
| commit | 394c4060d2d971b0ce6b9c86f9f5ef6dff7ae00e (patch) | |
| tree | c4f3ec42008bc271abfa608381ce9e0f2da96662 /compiler/rustc_codegen_ssa/src/debuginfo | |
| parent | f753bc769b16ca9673f11a4cc06e5cc681efd84e (diff) | |
| parent | 458a57adeba49fb5b9dcf379e96622ff93b567e0 (diff) | |
| download | rust-394c4060d2d971b0ce6b9c86f9f5ef6dff7ae00e.tar.gz rust-394c4060d2d971b0ce6b9c86f9f5ef6dff7ae00e.zip | |
Auto merge of #130269 - Zalathar:rollup-coxzt2t, r=Zalathar
Rollup of 8 pull requests Successful merges: - #125060 (Expand documentation of PathBuf, discussing lack of sanitization) - #129367 (Fix default/minimum deployment target for Aarch64 simulator targets) - #130156 (Add test for S_OBJNAME & update test for LF_BUILDINFO cl and cmd) - #130160 (Fix `slice::first_mut` docs) - #130235 (Simplify some nested `if` statements) - #130250 (Fix `clippy::useless_conversion`) - #130252 (Properly report error on `const gen fn`) - #130256 (Re-run coverage tests if `coverage-dump` was modified) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/debuginfo')
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs b/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs index 5103b2f3158..e34fbfe3f76 100644 --- a/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs +++ b/compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs @@ -236,15 +236,13 @@ fn push_debuginfo_type_name<'tcx>( let has_enclosing_parens = if cpp_like_debuginfo { output.push_str("dyn$<"); false + } else if trait_data.len() > 1 && auto_traits.len() != 0 { + // We need enclosing parens because there is more than one trait + output.push_str("(dyn "); + true } else { - if trait_data.len() > 1 && auto_traits.len() != 0 { - // We need enclosing parens because there is more than one trait - output.push_str("(dyn "); - true - } else { - output.push_str("dyn "); - false - } + output.push_str("dyn "); + false }; if let Some(principal) = trait_data.principal() { |