Skip to content

Commit 23f05fc

Browse files
committed
Auto merge of #1840 - hyd-dev:rustup, r=RalfJung
Update backtraces (rust-lang/rust#86034 changed them.) cc rust-lang/rust#86474
2 parents 5b7f1f9 + 2644647 commit 23f05fc

File tree

4 files changed

+25
-5
lines changed

4 files changed

+25
-5
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4d3ce2e7dac840d6ac7d658a5506eb31492fb3ef
1+
192920c22bc8433ab14706ee0829e707d119b74f

tests/run-pass/backtrace-api.stderr

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,9 @@ RUSTLIB/core/src/ops/function.rs:LL:COL (std::ops::function::impls::call_once)
1010
RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try::do_call)
1111
RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try)
1212
RUSTLIB/std/src/panic.rs:LL:COL (std::panic::catch_unwind)
13+
RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start_internal::{closure#2})
14+
RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try::do_call)
15+
RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try)
16+
RUSTLIB/std/src/panic.rs:LL:COL (std::panic::catch_unwind)
1317
RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start_internal)
1418
RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start)

tests/run-pass/backtrace-std.stderr

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,15 @@
2222
at RUSTLIB/std/src/panicking.rs:LL:CC
2323
11: std::panic::catch_unwind
2424
at RUSTLIB/std/src/panic.rs:LL:CC
25-
12: std::rt::lang_start_internal
25+
12: std::rt::lang_start_internal::{closure#2}
2626
at RUSTLIB/std/src/rt.rs:LL:CC
27-
13: std::rt::lang_start
27+
13: std::panicking::r#try::do_call
28+
at RUSTLIB/std/src/panicking.rs:LL:CC
29+
14: std::panicking::r#try
30+
at RUSTLIB/std/src/panicking.rs:LL:CC
31+
15: std::panic::catch_unwind
32+
at RUSTLIB/std/src/panic.rs:LL:CC
33+
16: std::rt::lang_start_internal
34+
at RUSTLIB/std/src/rt.rs:LL:CC
35+
17: std::rt::lang_start
2836
at RUSTLIB/std/src/rt.rs:LL:CC

tests/run-pass/panic/panic1.stderr

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,16 @@ stack backtrace:
1616
at RUSTLIB/$FILE:LL:COL
1717
7: std::panic::catch_unwind
1818
at RUSTLIB/$FILE:LL:COL
19-
8: std::rt::lang_start_internal
19+
8: std::rt::lang_start_internal::{closure#2}
2020
at RUSTLIB/$FILE:LL:COL
21-
9: std::rt::lang_start
21+
9: std::panicking::r#try::do_call
22+
at RUSTLIB/$FILE:LL:COL
23+
10: std::panicking::r#try
24+
at RUSTLIB/$FILE:LL:COL
25+
11: std::panic::catch_unwind
26+
at RUSTLIB/$FILE:LL:COL
27+
12: std::rt::lang_start_internal
28+
at RUSTLIB/$FILE:LL:COL
29+
13: std::rt::lang_start
2230
at RUSTLIB/$FILE:LL:COL
2331
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

0 commit comments

Comments
 (0)