diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-02-12 14:21:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 14:21:13 +0100 |
| commit | 6b40f59db111cfe87908330be31f33735f08813c (patch) | |
| tree | b9394a9c2ee76f29fe60f9188ea5bdd9a2ea93ae /src/libstd | |
| parent | 42f371c2eb0623b487c74f291956bb09af0b0351 (diff) | |
| parent | 090a1571d8c489588e2947ddb61b79f78b5b11b3 (diff) | |
| download | rust-6b40f59db111cfe87908330be31f33735f08813c.tar.gz rust-6b40f59db111cfe87908330be31f33735f08813c.zip | |
Rollup merge of #69042 - yaahc:backtrace-header, r=dtolnay
Remove backtrace header text Fixes point 3 from https://github.com/rust-lang/rust/issues/65280 related to https://github.com/rust-lang/rust/issues/53487 This should probably be double checked by someone who works on fuschia because theres some extra fuschia specific output in `add_context` that is also removed by this change.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/Cargo.toml | 2 | ||||
| -rw-r--r-- | src/libstd/sys_common/backtrace.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml index c9ff93eac02..b147aa55b2a 100644 --- a/src/libstd/Cargo.toml +++ b/src/libstd/Cargo.toml @@ -27,7 +27,7 @@ hashbrown = { version = "0.6.2", default-features = false, features = ['rustc-de [dependencies.backtrace_rs] package = "backtrace" -version = "0.3.37" +version = "0.3.44" default-features = false # without the libstd `backtrace` feature, stub out everything features = [ "rustc-dep-of-std" ] # enable build support for integrating into libstd diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs index 191add2c31b..289ee07babf 100644 --- a/src/libstd/sys_common/backtrace.rs +++ b/src/libstd/sys_common/backtrace.rs @@ -70,6 +70,7 @@ unsafe fn _print_fmt(fmt: &mut fmt::Formatter<'_>, print_fmt: PrintFmt) -> fmt:: let mut print_path = move |fmt: &mut fmt::Formatter<'_>, bows: BytesOrWideString<'_>| { output_filename(fmt, bows, print_fmt, cwd.as_ref()) }; + write!(fmt, "stack backtrace:\n")?; let mut bt_fmt = BacktraceFmt::new(fmt, print_fmt, &mut print_path); bt_fmt.add_context()?; let mut idx = 0; |