Skip to content

Commit b8a97c4

Browse files
committed
Auto merge of #2534 - saethlin:rustup, r=saethlin
rustup: bring in Miri backtrace-rs pruning fix The pruning logic in `backtrace` has always been broken in Miri. But now there's a fix!
2 parents ec43f1d + 4f30af5 commit b8a97c4

File tree

2 files changed

+1
-23
lines changed

2 files changed

+1
-23
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
47d1cdb0bcac8e417071ce1929d261efe2399ae2
1+
dec689432fac6720b2f18101ac28a21add98b1b8

tests/panic/panic1.stderr

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,4 @@ stack backtrace:
66
at $DIR/panic1.rs:LL:CC
77
2: <fn() as std::ops::FnOnce<()>>::call_once - shim(fn())
88
at RUSTLIB/core/src/ops/function.rs:LL:CC
9-
3: std::rt::lang_start::{closure#0}
10-
at RUSTLIB/std/src/rt.rs:LL:CC
11-
4: std::ops::function::impls::call_once
12-
at RUSTLIB/core/src/ops/function.rs:LL:CC
13-
5: std::panicking::r#try::do_call
14-
at RUSTLIB/std/src/panicking.rs:LL:CC
15-
6: std::panicking::r#try
16-
at RUSTLIB/std/src/panicking.rs:LL:CC
17-
7: std::panic::catch_unwind
18-
at RUSTLIB/std/src/panic.rs:LL:CC
19-
8: std::rt::lang_start_internal::{closure#2}
20-
at RUSTLIB/std/src/rt.rs:LL:CC
21-
9: std::panicking::r#try::do_call
22-
at RUSTLIB/std/src/panicking.rs:LL:CC
23-
10: std::panicking::r#try
24-
at RUSTLIB/std/src/panicking.rs:LL:CC
25-
11: std::panic::catch_unwind
26-
at RUSTLIB/std/src/panic.rs:LL:CC
27-
12: std::rt::lang_start_internal
28-
at RUSTLIB/std/src/rt.rs:LL:CC
29-
13: std::rt::lang_start
30-
at RUSTLIB/std/src/rt.rs:LL:CC
319
note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.

0 commit comments

Comments
 (0)