Skip to content

Commit 7fba3c2

Browse files
committed
Normalize out generic arguments in backtrace-api stderr
1 parent b1837d0 commit 7fba3c2

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

tests/run-pass/backtrace-api.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// normalize-stderr-test ".*rustlib" -> "RUSTLIB"
22
// normalize-stderr-test "RUSTLIB/(.*):\d+:\d+ "-> "RUSTLIB/$1:LL:COL "
3+
// normalize-stderr-test "::<.*>" -> ""
34

45
extern "Rust" {
56
fn miri_get_backtrace(flags: u64) -> Box<[*mut ()]>;

tests/run-pass/backtrace-api.stderr

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
$DIR/backtrace-api.rs:20:59 (func_c)
2-
$DIR/backtrace-api.rs:19:53 (func_b::<u8>)
3-
$DIR/backtrace-api.rs:18:50 (func_a)
4-
$DIR/backtrace-api.rs:24:18 (main)
1+
$DIR/backtrace-api.rs:21:59 (func_c)
2+
$DIR/backtrace-api.rs:20:53 (func_b)
3+
$DIR/backtrace-api.rs:19:50 (func_a)
4+
$DIR/backtrace-api.rs:25:18 (main)
55
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::<fn(), ()>)
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::<impl std::ops::FnOnce<()> for &dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe>::call_once)
9-
RUSTLIB/src/rust/library/std/src/panicking.rs:LL:COL (std::panicking::r#try::do_call::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32>)
10-
RUSTLIB/src/rust/library/std/src/panicking.rs:LL:COL (std::panicking::r#try::<i32, &dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe>)
11-
RUSTLIB/src/rust/library/std/src/panic.rs:LL:COL (std::panic::catch_unwind::<&dyn std::ops::Fn() -> i32 + std::marker::Sync + std::panic::RefUnwindSafe, i32>)
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)
1212
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::<()>)
13+
RUSTLIB/src/rust/library/std/src/rt.rs:LL:COL (std::rt::lang_start)

tests/run-pass/backtrace-api.stdout

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$DIR/backtrace-api.rs:20:59 (func_c)
2-
$DIR/backtrace-api.rs:19:53 (func_b::<u8>)
3-
$DIR/backtrace-api.rs:18:50 (func_a)
4-
$DIR/backtrace-api.rs:24:18 (main)
1+
$DIR/backtrace-api.rs:21:59 (func_c)
2+
$DIR/backtrace-api.rs:20:53 (func_b::<u8>)
3+
$DIR/backtrace-api.rs:19:50 (func_a)
4+
$DIR/backtrace-api.rs:25:18 (main)

0 commit comments

Comments
 (0)