about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2017-02-26 17:39:25 +0300
committerYamakaky <yamakaky@gmail.com>2017-02-26 09:39:25 -0500
commit9e054cf59dba2cb6612da745d663ab74be7fb3a7 (patch)
tree8fb6264a621b4556a791a1a93c99d21cf1175a34 /src/libstd
parentc8b17427c2b4dd3eed005b3a30dcb94892144825 (diff)
downloadrust-9e054cf59dba2cb6612da745d663ab74be7fb3a7.tar.gz
rust-9e054cf59dba2cb6612da745d663ab74be7fb3a7.zip
Fix tests on Windows in Debug configuration (#4)
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys_common/backtrace.rs6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstd/sys_common/backtrace.rs b/src/libstd/sys_common/backtrace.rs
index 08801f543ef..476f9afa27d 100644
--- a/src/libstd/sys_common/backtrace.rs
+++ b/src/libstd/sys_common/backtrace.rs
@@ -106,8 +106,10 @@ fn filter_frames(frames: &[Frame],
     static BAD_PREFIXES_TOP: &'static [&'static str] = &[
         "_ZN3std3sys3imp9backtrace",
         "ZN3std3sys3imp9backtrace",
+        "std::sys::imp::backtrace",
         "_ZN3std10sys_common9backtrace",
         "ZN3std10sys_common9backtrace",
+        "std::sys_common::backtrace",
         "_ZN3std9panicking",
         "ZN3std9panicking",
         "std::panicking",
@@ -116,6 +118,7 @@ fn filter_frames(frames: &[Frame],
         "core::panicking",
         "_ZN4core6result13unwrap_failed",
         "ZN4core6result13unwrap_failed",
+        "core::result::unwrap_failed",
         "rust_begin_unwind",
         "_ZN4drop",
         "mingw_set_invalid_parameter_handler",
@@ -129,6 +132,8 @@ fn filter_frames(frames: &[Frame],
         "core::panicking",
         "_ZN3std2rt10lang_start",
         "ZN3std2rt10lang_start",
+        "std::rt::lang_start",
+        "panic_unwind::__rust_maybe_catch_panic",
         "__rust_maybe_catch_panic",
         "_rust_maybe_catch_panic",
         "__libc_start_main",
@@ -136,6 +141,7 @@ fn filter_frames(frames: &[Frame],
         "_start",
         "main",
         "BaseThreadInitThunk",
+        "RtlInitializeExceptionChain",
         "__scrt_common_main_seh",
         "_ZN4drop",
         "mingw_set_invalid_parameter_handler",