From 3c6003c4c0505381544c03b9b9f0f697c002dd67 Mon Sep 17 00:00:00 2001
From: Mark Rousskov <mark.simulacrum@gmail.com>
Date: Tue, 21 Jul 2020 21:41:45 -0400
Subject: [PATCH] Revert "std: Fix compilation without backtrace feature"

This reverts commit 028f8d7b85898683b99e05564cd2976c7e0d5b43.
---
 src/libstd/Cargo.toml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/libstd/Cargo.toml b/src/libstd/Cargo.toml
index 42403bdb1bc..136db6d5d32 100644
--- a/src/libstd/Cargo.toml
+++ b/src/libstd/Cargo.toml
@@ -27,7 +27,7 @@ hashbrown = { version = "0.6.2", default-features = false, features = ['rustc-de
 
 # Dependencies of the `backtrace` crate
 addr2line = { version = "0.13.0", optional = true, default-features = false }
-rustc-demangle = { version = "0.1.4", features = ['rustc-dep-of-std'] }
+rustc-demangle = { version = "0.1.4", optional = true }
 miniz_oxide = { version = "0.4.0", optional = true, default-features = false }
 [dependencies.object]
 version = "0.20"
@@ -55,6 +55,7 @@ backtrace = [
   "gimli-symbolize",
   'addr2line/rustc-dep-of-std',
   'object/rustc-dep-of-std',
+  'rustc-demangle/rustc-dep-of-std',
   'miniz_oxide/rustc-dep-of-std',
 ]
 gimli-symbolize = []