Skip to content

Commit 007ab53

Browse files
committed
Support also normalizing column numbers
1 parent df41091 commit 007ab53

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

tests/run-pass/backtrace-std.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
// normalize-stderr-test "at .*/(rust[^/]*|checkout)/library/" -> "at RUSTLIB/"
2-
// normalize-stderr-test "RUSTLIB/(.*):\d+"-> "RUSTLIB/$1:LL"
2+
// normalize-stderr-test "RUSTLIB/([^:]*):\d+(:\d+)?"-> "RUSTLIB/$1:LL:?CC"
3+
// normalize-stderr-test "/backtrace-std.rs:(\d+)(:\d+)?"-> "/backtrace-std.rs:$1:?CC"
34
// normalize-stderr-test "::<.*>" -> ""
45
// compile-flags: -Zmiri-disable-isolation
56

tests/run-pass/backtrace-std.stderr

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
0: func_d
2-
at $DIR/backtrace-std.rs:18
2+
at $DIR/backtrace-std.rs:19:?CC
33
1: func_c
4-
at $DIR/backtrace-std.rs:17
4+
at $DIR/backtrace-std.rs:18:?CC
55
2: func_b
6-
at $DIR/backtrace-std.rs:11
6+
at $DIR/backtrace-std.rs:12:?CC
77
3: func_a
8-
at $DIR/backtrace-std.rs:10
8+
at $DIR/backtrace-std.rs:11:?CC
99
4: main
10-
at $DIR/backtrace-std.rs:21
10+
at $DIR/backtrace-std.rs:22:?CC
1111
5: <fn() as std::ops::FnOnce<()>>::call_once - shim(fn())
12-
at RUSTLIB/core/src/ops/function.rs:LL
12+
at RUSTLIB/core/src/ops/function.rs:LL:?CC
1313
6: std::sys_common::backtrace::__rust_begin_short_backtrace
14-
at RUSTLIB/std/src/sys_common/backtrace.rs:LL
14+
at RUSTLIB/std/src/sys_common/backtrace.rs:LL:?CC
1515
7: std::rt::lang_start::{closure#0}
16-
at RUSTLIB/std/src/rt.rs:LL
16+
at RUSTLIB/std/src/rt.rs:LL:?CC
1717
8: std::ops::function::impls::call_once
18-
at RUSTLIB/core/src/ops/function.rs:LL
18+
at RUSTLIB/core/src/ops/function.rs:LL:?CC
1919
9: std::panicking::r#try::do_call
20-
at RUSTLIB/std/src/panicking.rs:LL
20+
at RUSTLIB/std/src/panicking.rs:LL:?CC
2121
10: std::panicking::r#try
22-
at RUSTLIB/std/src/panicking.rs:LL
22+
at RUSTLIB/std/src/panicking.rs:LL:?CC
2323
11: std::panic::catch_unwind
24-
at RUSTLIB/std/src/panic.rs:LL
24+
at RUSTLIB/std/src/panic.rs:LL:?CC
2525
12: std::rt::lang_start_internal
26-
at RUSTLIB/std/src/rt.rs:LL
26+
at RUSTLIB/std/src/rt.rs:LL:?CC
2727
13: std::rt::lang_start
28-
at RUSTLIB/std/src/rt.rs:LL
28+
at RUSTLIB/std/src/rt.rs:LL:?CC

0 commit comments

Comments
 (0)