bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Do not suggest using -Zmacro-backtrace for builtin macros

Browse source 
For macros that are implemented on the compiler, we do *not* mention the `-Zmacro-backtrace` flag. This includes `derive`s and standard macros.
This commit is contained in:
Esteban Küber 2025-03-11 23:42:36 +00:00
parent f7b4354283
commit f0b8e13b59
205 changed files with 27 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_errors/src/emitter.rs
View file

@ -297,7 +297,9 @@ pub trait Emitter: Translate {
// are some which do actually involve macros.
ExpnKind::Desugaring(..) | ExpnKind::AstPass(..) => None,
ExpnKind::Macro(macro_kind, name) => Some((macro_kind, name)),
ExpnKind::Macro(macro_kind, name) => {
Some((macro_kind, name, expn_data.hide_backtrace))
}
}
})
.collect();
@ -309,13 +311,17 @@ pub trait Emitter: Translate {
self.render_multispans_macro_backtrace(span, children, backtrace);
if !backtrace {
if let Some((macro_kind, name)) = has_macro_spans.first() {
// Skip builtin macros, as their expansion isn't relevant to the end user. This includes
// actual intrinsics, like `asm!`.
if let Some((macro_kind, name, _)) = has_macro_spans.first()
&& let Some((_, _, false)) = has_macro_spans.last()
{
// Mark the actual macro this originates from
let and_then = if let Some((macro_kind, last_name)) = has_macro_spans.last()
let and_then = if let Some((macro_kind, last_name, _)) = has_macro_spans.last()
&& last_name != name
{
let descr = macro_kind.descr();
format!(" which comes from the expansion of the {descr} `{last_name}`",)
format!(" which comes from the expansion of the {descr} `{last_name}`")
} else {
"".to_string()
};