diff options
| author | Yuki Okushi <jtitor@2k36.org> | 2021-06-22 07:37:47 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-22 07:37:47 +0900 |
| commit | 7ee6b8bc439501e8690af80b9995aa53c856e9e8 (patch) | |
| tree | d13446c503de2efca7a69fc3f03d25298752f046 | |
| parent | 4463b08652110e96700f65bb584004e67da497e6 (diff) | |
| parent | 8423a19f66a8b98e34576186f03ce66161cd691b (diff) | |
| download | rust-7ee6b8bc439501e8690af80b9995aa53c856e9e8.tar.gz rust-7ee6b8bc439501e8690af80b9995aa53c856e9e8.zip | |
Rollup merge of #86114 - JDuchniewicz:feat/panic-frame-fmt, r=yaahc
Reopen #79692 (Format symbols under shared frames) Reopening #79692.
| -rw-r--r-- | library/std/src/backtrace.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/library/std/src/backtrace.rs b/library/std/src/backtrace.rs index 0aae4674b29..f8884523cf4 100644 --- a/library/std/src/backtrace.rs +++ b/library/std/src/backtrace.rs @@ -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 { |