squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Rollup merge of #86114 - JDuchniewicz:feat/panic-frame-fmt, r=yaahc

Browse source 
Reopen #79692 (Format symbols under shared frames)

Reopening #79692.
This commit is contained in:
Yuki Okushi 2021-06-22 07:37:47 +09:00 committed by GitHub
commit 7ee6b8bc43
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/std/src/backtrace.rs
View file

@ -399,12 +399,11 @@ impl fmt::Display for Backtrace {
let mut f = backtrace_rs::BacktraceFmt::new(fmt, style, &mut print_path);
f.add_context()?;
for frame in frames {
let mut f = f.frame();
if frame.symbols.is_empty() {
f.print_raw(frame.frame.ip(), None, None, None)?;
f.frame().print_raw(frame.frame.ip(), None, None, None)?;
} else {
for symbol in frame.symbols.iter() {
f.print_raw_with_column(
f.frame().print_raw_with_column(
frame.frame.ip(),
symbol.name.as_ref().map(|b| backtrace_rs::SymbolName::new(b)),
symbol.filename.as_ref().map(|b| match b {