bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix failing backtrace ui tests

Browse source
This commit is contained in:
Jane Lusby 2020-02-11 16:57:22 -08:00
parent d2b08c7e93
commit 090a1571d8
2 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/libstd/sys_common/backtrace.rs
View file

@ -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<'_>| { let mut print_path = move |fmt: &mut fmt::Formatter<'_>, bows: BytesOrWideString<'_>| {
output_filename(fmt, bows, print_fmt, cwd.as_ref()) 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); let mut bt_fmt = BacktraceFmt::new(fmt, print_fmt, &mut print_path);
bt_fmt.add_context()?; bt_fmt.add_context()?;
let mut idx = 0; let mut idx = 0;

4
src/test/ui/std-backtrace.rs
View file

@ -16,9 +16,9 @@ use std::str;
fn main() { fn main() {
let args: Vec<String> = env::args().collect(); let args: Vec<String> = env::args().collect();
if args.len() >= 2 && args[1] == "force" { if args.len() >= 2 && args[1] == "force" {
println!("{}", std::backtrace::Backtrace::force_capture()); println!("stack backtrace:\n{}", std::backtrace::Backtrace::force_capture());
} else if args.len() >= 2 { } else if args.len() >= 2 {
println!("{}", std::backtrace::Backtrace::capture()); println!("stack backtrace:\n{}", std::backtrace::Backtrace::capture());
} else { } else {
runtest(&args[0]); runtest(&args[0]);
println!("test ok"); println!("test ok");