Skip to content

Commit 552a959

Browse files
committedFeb 12, 2025
Auto merge of #136918 - GuillaumeGomez:rollup-f6h21gg, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - #134981 ( Explain that in paths generics can't be set on both the enum and the variant) - #136698 (Replace i686-unknown-redox target with i586-unknown-redox) - #136767 (improve host/cross target checking) - #136829 ([rustdoc] Move line numbers into the `<code>` directly) - #136875 (Rustc dev guide subtree update) - #136900 (compiler: replace `ExternAbi::name` calls with formatters) - #136913 (Put kobzol back on review rotation) - #136915 (documentation fix: `f16` and `f128` are not double-precision) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 021fb9c + 40f0499 commit 552a959

File tree

69 files changed

+578
-399
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+578
-399
lines changed
 

‎compiler/rustc_codegen_ssa/src/debuginfo/type_names.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -367,9 +367,7 @@ fn push_debuginfo_type_name<'tcx>(
367367
output.push_str(sig.safety.prefix_str());
368368

369369
if sig.abi != rustc_abi::ExternAbi::Rust {
370-
output.push_str("extern \"");
371-
output.push_str(sig.abi.name());
372-
output.push_str("\" ");
370+
let _ = write!(output, "extern {} ", sig.abi);
373371
}
374372

375373
output.push_str("fn(");

‎compiler/rustc_errors/src/diagnostic_impls.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ into_diag_arg_using_display!(
9393
SplitDebuginfo,
9494
ExitStatus,
9595
ErrCode,
96+
rustc_abi::ExternAbi,
9697
);
9798

9899
impl<I: rustc_type_ir::Interner> IntoDiagArg for rustc_type_ir::TraitRef<I> {

0 commit comments

Comments
 (0)
Please sign in to comment.