Skip to content

Commit ee4ea97

Browse files
committed
Better record locations of executed steps
Before it would just show the `ensure` function
1 parent e6dc840 commit ee4ea97

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

src/bootstrap/src/core/builder/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1598,7 +1598,8 @@ Alternatively, you can set `build.local-rebuild=true` and use a stage0 compiler
15981598
// in the step_name field.
15991599
"step",
16001600
step_name = pretty_step_name::<S>(),
1601-
args = step_debug_args(&step)
1601+
args = step_debug_args(&step),
1602+
location = crate::utils::tracing::format_location(*std::panic::Location::caller())
16021603
);
16031604
span.entered()
16041605
};

src/bootstrap/src/utils/tracing.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ mod inner {
351351
let field = &values.fields[0];
352352
write!(writer, " {{{}}}", field.1)?;
353353
}
354-
write_location(writer, span.metadata())?;
354+
write_with_location(writer)?;
355355
}
356356
// Executed command
357357
COMMAND_SPAN_TARGET => {

0 commit comments

Comments
 (0)