diff options
| author | bors <bors@rust-lang.org> | 2022-09-03 22:16:50 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-03 22:16:50 +0000 |
| commit | b8a97c4b975a4d75cafc267c9bb20f26d8fae292 (patch) | |
| tree | a5c393f1c09557aad8633fa1a8eb4089e23dbd9e | |
| parent | ec43f1dd9b8bfed8939e8df8424d329d7e1c0253 (diff) | |
| parent | 4f30af52738c163c39e1d928c36664e627ee31db (diff) | |
| download | rust-b8a97c4b975a4d75cafc267c9bb20f26d8fae292.tar.gz rust-b8a97c4b975a4d75cafc267c9bb20f26d8fae292.zip | |
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!
| -rw-r--r-- | rust-version | 2 | ||||
| -rw-r--r-- | tests/panic/panic1.stderr | 22 |
2 files changed, 1 insertions, 23 deletions
diff --git a/rust-version b/rust-version index 5ce9544acc7..0c6d053e9b4 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -47d1cdb0bcac8e417071ce1929d261efe2399ae2 +dec689432fac6720b2f18101ac28a21add98b1b8 diff --git a/tests/panic/panic1.stderr b/tests/panic/panic1.stderr index f86ce187b2c..15834d58bc6 100644 --- a/tests/panic/panic1.stderr +++ b/tests/panic/panic1.stderr @@ -6,26 +6,4 @@ stack backtrace: at $DIR/panic1.rs:LL:CC 2: <fn() as std::ops::FnOnce<()>>::call_once - shim(fn()) at RUSTLIB/core/src/ops/function.rs:LL:CC - 3: std::rt::lang_start::{closure#0} - at RUSTLIB/std/src/rt.rs:LL:CC - 4: std::ops::function::impls::call_once - at RUSTLIB/core/src/ops/function.rs:LL:CC - 5: std::panicking::r#try::do_call - at RUSTLIB/std/src/panicking.rs:LL:CC - 6: std::panicking::r#try - at RUSTLIB/std/src/panicking.rs:LL:CC - 7: std::panic::catch_unwind - at RUSTLIB/std/src/panic.rs:LL:CC - 8: std::rt::lang_start_internal::{closure#2} - at RUSTLIB/std/src/rt.rs:LL:CC - 9: std::panicking::r#try::do_call - at RUSTLIB/std/src/panicking.rs:LL:CC - 10: std::panicking::r#try - at RUSTLIB/std/src/panicking.rs:LL:CC - 11: std::panic::catch_unwind - at RUSTLIB/std/src/panic.rs:LL:CC - 12: std::rt::lang_start_internal - at RUSTLIB/std/src/rt.rs:LL:CC - 13: std::rt::lang_start - at RUSTLIB/std/src/rt.rs:LL:CC note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace. |