Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Add initial debug fmt for Backtrace #69038

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Feb 13, 2020
Merged

Add initial debug fmt for Backtrace #69038

Changes from 11 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b637c0e
Add initial debug fmt for Backtrace
yaahc Feb 10, 2020
4920456
Get vaguely working with a test for checking output
yaahc Feb 10, 2020
c0ba79e
less noisy format
yaahc Feb 10, 2020
0d5444f
remove unnecessary derives
yaahc Feb 10, 2020
76e6d6f
remove unnecessary Debug impl for BacktraceFrame
yaahc Feb 10, 2020
583dd2c
make it compile
yaahc Feb 10, 2020
8711778
final format cleanups
yaahc Feb 10, 2020
70c9133
remove Some from fn name
yaahc Feb 10, 2020
230ed3e
use debug_map and skip empty frames
yaahc Feb 11, 2020
de25048
add nice alt fmt for debug
yaahc Feb 11, 2020
192b103
make symbol printing consistent with backtrace_rs
yaahc Feb 11, 2020
7064a0e
maximum alternative consistency!
yaahc Feb 11, 2020
6797bfd
rule over the code in libstd with an iron fist
yaahc Feb 11, 2020
c8817aa
backwards again, god damnit
yaahc Feb 11, 2020
ec8ee7f
remove intentionally failing test
yaahc Feb 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 79 additions & 6 deletions src/libstd/backtrace.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,68 @@ enum BytesOrWide {
Wide(Vec<u16>),
}

impl fmt::Debug for Backtrace {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut capture = match &self.inner {
Inner::Unsupported => return fmt.write_str("unsupported backtrace"),
Inner::Disabled => return fmt.write_str("disabled backtrace"),
Inner::Captured(c) => c.lock().unwrap(),
};
capture.resolve();

write!(fmt, "Backtrace ")?;

let mut dbg = fmt.debug_list();

for frame in &capture.frames {
if frame.frame.ip().is_null() {
continue;
}

dbg.entries(&frame.symbols);
}

dbg.finish()
}
}

impl fmt::Debug for BacktraceSymbol {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
write!(fmt, "{{ ")?;

if let Some(fn_name) = self.name.as_ref().map(|b| backtrace::SymbolName::new(b)) {
write!(fmt, "fn: ")?;
fmt::Display::fmt(&fn_name, fmt)?;
} else {
write!(fmt, "fn: <unknown>")?;
}

if let Some(fname) = self.filename.as_ref() {
write!(fmt, ", file: {:?}", fname)?;
}

if let Some(line) = self.lineno.as_ref() {
write!(fmt, ", line: {:?}", line)?;
}

write!(fmt, " }}")
}
}

impl fmt::Debug for BytesOrWide {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
output_filename(
fmt,
match self {
BytesOrWide::Bytes(w) => BytesOrWideString::Bytes(w),
BytesOrWide::Wide(w) => BytesOrWideString::Wide(w),
},
backtrace::PrintFmt::Full,
crate::env::current_dir().as_ref().ok(),
)
}
}

impl Backtrace {
/// Returns whether backtrace captures are enabled through environment
/// variables.
Expand Down Expand Up @@ -267,12 +329,6 @@ impl Backtrace {
}

impl fmt::Display for Backtrace {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
fmt::Debug::fmt(self, fmt)
}
}

impl fmt::Debug for Backtrace {
fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {
let mut capture = match &self.inner {
Inner::Unsupported => return fmt.write_str("unsupported backtrace"),
Expand Down Expand Up @@ -351,3 +407,20 @@ impl Capture {
}
}
}

#[cfg(test)]
mod tests {
use super::*;

#[test]
fn debug_backtrace_fmt() {
let bt = Backtrace::capture();
eprintln!("uncaptured: {:?}", bt);
let bt = Backtrace::force_capture();
eprintln!("captured: {:?}", bt);
eprintln!("display print: {}", bt);
eprintln!("resolved: {:?}", bt);
eprintln!("resolved alt: {:#?}", bt);
unimplemented!();
}
}