Skip to content

Commit 266b75f

Browse files
committed
Auto merge of #1566 - RalfJung:backtrace, r=RalfJung
normalize backtrace stderr even more The test previously failed on rustc CI with this diff: ``` $DIR/backtrace-api.rs:21:59 (func_c) $DIR/backtrace-api.rs:20:53 (func_b) $DIR/backtrace-api.rs:19:50 (func_a) $DIR/backtrace-api.rs:25:18 (main) -RUSTLIB/src/rust/library/core/src/ops/function.rs:LL:COL (<fn() as std::ops::FnOnce<()>>::call_once - shim(fn())) -RUSTLIB/src/rust/library/std/src/sys_common/backtrace.rs:LL:COL (std::sys_common::backtrace::__rust_begin_short_backtrace) -RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start::{closure#0}) -RUSTLIB/src/rust/library/core/src/ops/function.rs:LL:COL (std::ops::function::impls::call_once) -RUSTLIB/src/rust/library/std/src/panicking.rs:LL:COL (std::panicking::r#try::do_call) -RUSTLIB/src/rust/library/std/src/panicking.rs:LL:COL (std::panicking::r#try) -RUSTLIB/src/rust/library/std/src/panic.rs:LL:COL (std::panic::catch_unwind) -RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start_internal) -RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start) +/checkout/library/core/src/ops/function.rs:227:5 (<fn() as std::ops::FnOnce<()>>::call_once - shim(fn())) +/checkout/library/std/src/sys_common/backtrace.rs:137:18 (std::sys_common::backtrace::__rust_begin_short_backtrace) +/checkout/library/std/src/rt.rs:66:18 (std::rt::lang_start::{closure#0}) +/checkout/library/core/src/ops/function.rs:259:13 (std::ops::function::impls::call_once) +/checkout/library/std/src/panicking.rs:381:40 (std::panicking::r#try::do_call) +/checkout/library/std/src/panicking.rs:345:19 (std::panicking::r#try) +/checkout/library/std/src/panic.rs:382:14 (std::panic::catch_unwind) +/checkout/library/std/src/rt.rs:51:25 (std::rt::lang_start_internal) +/checkout/library/std/src/rt.rs:65:5 (std::rt::lang_start) ``` Cc `@Aaron1011`
2 parents e046963 + 17e16aa commit 266b75f

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
26373fb4baa9c5b8a7a1e2821fcfa930a85d327d
1+
c0127e4dbf3a9d3a67ddb1da19f8441019aab8f8

tests/run-pass/backtrace-api.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// normalize-stderr-test ".*rustlib" -> "RUSTLIB"
1+
// normalize-stderr-test ".*/(rust|checkout)/library/" -> "RUSTLIB/"
22
// normalize-stderr-test "RUSTLIB/(.*):\d+:\d+ "-> "RUSTLIB/$1:LL:COL "
33
// normalize-stderr-test "::<.*>" -> ""
44

tests/run-pass/backtrace-api.stderr

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ $DIR/backtrace-api.rs:21:59 (func_c)
22
$DIR/backtrace-api.rs:20:53 (func_b)
33
$DIR/backtrace-api.rs:19:50 (func_a)
44
$DIR/backtrace-api.rs:25:18 (main)
5-
RUSTLIB/src/rust/library/core/src/ops/function.rs:LL:COL (<fn() as std::ops::FnOnce<()>>::call_once - shim(fn()))
6-
RUSTLIB/src/rust/library/std/src/sys_common/backtrace.rs:LL:COL (std::sys_common::backtrace::__rust_begin_short_backtrace)
7-
RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start::{closure#0})
8-
RUSTLIB/src/rust/library/core/src/ops/function.rs:LL:COL (std::ops::function::impls::call_once)
9-
RUSTLIB/src/rust/library/std/src/panicking.rs:LL:COL (std::panicking::r#try::do_call)
10-
RUSTLIB/src/rust/library/std/src/panicking.rs:LL:COL (std::panicking::r#try)
11-
RUSTLIB/src/rust/library/std/src/panic.rs:LL:COL (std::panic::catch_unwind)
12-
RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start_internal)
13-
RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start)
5+
RUSTLIB/core/src/ops/function.rs:LL:COL (<fn() as std::ops::FnOnce<()>>::call_once - shim(fn()))
6+
RUSTLIB/std/src/sys_common/backtrace.rs:LL:COL (std::sys_common::backtrace::__rust_begin_short_backtrace)
7+
RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start::{closure#0})
8+
RUSTLIB/core/src/ops/function.rs:LL:COL (std::ops::function::impls::call_once)
9+
RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try::do_call)
10+
RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try)
11+
RUSTLIB/std/src/panic.rs:LL:COL (std::panic::catch_unwind)
12+
RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start_internal)
13+
RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start)

0 commit comments

Comments
 (0)