Skip to content

Commit 7847f79

Browse files
committed
Auto merge of #952 - RalfJung:rustup, r=RalfJung
temporarily enable backtrace feature This is a temporary hack to work around rust-lang/rust#64410.
2 parents b1d35d5 + 78cfdce commit 7847f79

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

rust-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
74d5c70b174f06843049af2d764ff57ddc81c81c
1+
eb48d6bdee6c655d71f26594d47d232adf3e4e93

src/bin/cargo-miri.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,9 @@ fn setup(ask_user: bool) {
294294
default_features = false
295295
# We need the `panic_unwind` feature because we use the `unwind` panic strategy.
296296
# Using `abort` works for libstd, but then libtest will not compile.
297-
features = ["panic_unwind"]
297+
# FIXME: Temporarily enabling backtrace feature to work around
298+
# <https://github.com/rust-lang/rust/issues/64410>.
299+
features = ["panic_unwind", "backtrace"]
298300
299301
[dependencies.test]
300302
"#).unwrap();

0 commit comments

Comments
 (0)