From 8cd215dc9733defd7f73c3955bc21c63d8b3ed7e Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 16 Sep 2019 22:22:54 +0200
Subject: [PATCH] remove libstd backtrace work-around

---
 rust-version          | 2 +-
 src/bin/cargo-miri.rs | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/rust-version b/rust-version
index 07e965d7c39..464b061edbd 100644
--- a/rust-version
+++ b/rust-version
@@ -1 +1 @@
-96d07e0ac9f0c56b95a2561c6cedac0b23a5d2a3
+a44881d892fb4f4a8ed93f8f392bab942fac7a41
diff --git a/src/bin/cargo-miri.rs b/src/bin/cargo-miri.rs
index d92fc344e8a..43e8761d48c 100644
--- a/src/bin/cargo-miri.rs
+++ b/src/bin/cargo-miri.rs
@@ -288,9 +288,7 @@ fn setup(ask_user: bool) {
 default_features = false
 # We need the `panic_unwind` feature because we use the `unwind` panic strategy.
 # Using `abort` works for libstd, but then libtest will not compile.
-# FIXME: Temporarily enabling backtrace feature to work around
-# <https://github.com/rust-lang/rust/issues/64410>.
-features = ["panic_unwind", "backtrace"]
+features = ["panic_unwind"]
 
 [dependencies.test]
         "#).unwrap();
-- 
2.44.0