Skip to content

Commit e102a48

Browse files
JohnTitorgitbot
authored and
gitbot
committed
Rollup merge of rust-lang#86114 - JDuchniewicz:feat/panic-frame-fmt, r=yaahc
Reopen rust-lang#79692 (Format symbols under shared frames) Reopening rust-lang#79692.
2 parents 22c0cb3 + 6b12584 commit e102a48

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

std/src/backtrace.rs

+2-3
Original file line numberDiff line numberDiff line change
@@ -399,12 +399,11 @@ impl fmt::Display for Backtrace {
399399
let mut f = backtrace_rs::BacktraceFmt::new(fmt, style, &mut print_path);
400400
f.add_context()?;
401401
for frame in frames {
402-
let mut f = f.frame();
403402
if frame.symbols.is_empty() {
404-
f.print_raw(frame.frame.ip(), None, None, None)?;
403+
f.frame().print_raw(frame.frame.ip(), None, None, None)?;
405404
} else {
406405
for symbol in frame.symbols.iter() {
407-
f.print_raw_with_column(
406+
f.frame().print_raw_with_column(
408407
frame.frame.ip(),
409408
symbol.name.as_ref().map(|b| backtrace_rs::SymbolName::new(b)),
410409
symbol.filename.as_ref().map(|b| match b {

0 commit comments

Comments
 (0)