diff --git a/rust-version b/rust-version index 33ad4403bb..128548fd92 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -4d3ce2e7dac840d6ac7d658a5506eb31492fb3ef +192920c22bc8433ab14706ee0829e707d119b74f diff --git a/tests/run-pass/backtrace-api.stderr b/tests/run-pass/backtrace-api.stderr index a5208221da..bd5908ba29 100644 --- a/tests/run-pass/backtrace-api.stderr +++ b/tests/run-pass/backtrace-api.stderr @@ -10,5 +10,9 @@ RUSTLIB/core/src/ops/function.rs:LL:COL (std::ops::function::impls::call_once) RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try::do_call) RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try) RUSTLIB/std/src/panic.rs:LL:COL (std::panic::catch_unwind) +RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start_internal::{closure#2}) +RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try::do_call) +RUSTLIB/std/src/panicking.rs:LL:COL (std::panicking::r#try) +RUSTLIB/std/src/panic.rs:LL:COL (std::panic::catch_unwind) RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start_internal) RUSTLIB/std/src/rt.rs:LL:COL (std::rt::lang_start) diff --git a/tests/run-pass/backtrace-std.stderr b/tests/run-pass/backtrace-std.stderr index 09f035b972..64386085c7 100644 --- a/tests/run-pass/backtrace-std.stderr +++ b/tests/run-pass/backtrace-std.stderr @@ -22,7 +22,15 @@ 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 + 12: std::rt::lang_start_internal::{closure#2} at RUSTLIB/std/src/rt.rs:LL:CC - 13: std::rt::lang_start + 13: std::panicking::r#try::do_call + at RUSTLIB/std/src/panicking.rs:LL:CC + 14: std::panicking::r#try + at RUSTLIB/std/src/panicking.rs:LL:CC + 15: std::panic::catch_unwind + at RUSTLIB/std/src/panic.rs:LL:CC + 16: std::rt::lang_start_internal + at RUSTLIB/std/src/rt.rs:LL:CC + 17: std::rt::lang_start at RUSTLIB/std/src/rt.rs:LL:CC diff --git a/tests/run-pass/panic/panic1.stderr b/tests/run-pass/panic/panic1.stderr index e0f1aa5dad..0b59b2a523 100644 --- a/tests/run-pass/panic/panic1.stderr +++ b/tests/run-pass/panic/panic1.stderr @@ -16,8 +16,16 @@ stack backtrace: at RUSTLIB/$FILE:LL:COL 7: std::panic::catch_unwind at RUSTLIB/$FILE:LL:COL - 8: std::rt::lang_start_internal + 8: std::rt::lang_start_internal::{closure#2} at RUSTLIB/$FILE:LL:COL - 9: std::rt::lang_start + 9: std::panicking::r#try::do_call + at RUSTLIB/$FILE:LL:COL + 10: std::panicking::r#try + at RUSTLIB/$FILE:LL:COL + 11: std::panic::catch_unwind + at RUSTLIB/$FILE:LL:COL + 12: std::rt::lang_start_internal + at RUSTLIB/$FILE:LL:COL + 13: std::rt::lang_start at RUSTLIB/$FILE:LL:COL note: Some details are omitted, run with `RUST_BACKTRACE=full` for a verbose backtrace.