Skip to content

Commit 44ca0f6

Browse files
committed
Auto merge of #955 - RalfJung:rustup, r=RalfJung
remove libstd backtrace work-around
2 parents d0a1050 + 8cd215d commit 44ca0f6

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

rust-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
96d07e0ac9f0c56b95a2561c6cedac0b23a5d2a3
1+
a44881d892fb4f4a8ed93f8f392bab942fac7a41

src/bin/cargo-miri.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,9 +288,7 @@ fn setup(ask_user: bool) {
288288
default_features = false
289289
# We need the `panic_unwind` feature because we use the `unwind` panic strategy.
290290
# Using `abort` works for libstd, but then libtest will not compile.
291-
# FIXME: Temporarily enabling backtrace feature to work around
292-
# <https://github.com/rust-lang/rust/issues/64410>.
293-
features = ["panic_unwind", "backtrace"]
291+
features = ["panic_unwind"]
294292
295293
[dependencies.test]
296294
"#).unwrap();

0 commit comments

Comments
 (0)