From 3141a59a474fc53c3d4c31a1605f01735f531f91 Mon Sep 17 00:00:00 2001
From: boats <boats@mozilla.com>
Date: Mon, 29 Jan 2018 15:24:11 -0800
Subject: [PATCH] Make backtrace off by default.

---
 failure-1.X/Cargo.toml           |  2 +-
 failure-1.X/src/backtrace/mod.rs | 15 +++++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/failure-1.X/Cargo.toml b/failure-1.X/Cargo.toml
index eaf2d8b..4790f3c 100644
--- a/failure-1.X/Cargo.toml
+++ b/failure-1.X/Cargo.toml
@@ -19,5 +19,5 @@ version = "0.3.3"
 
 [features]
 default = ["std", "derive"]
-std = ["backtrace"]
+std = []
 derive = ["failure_derive"]
diff --git a/failure-1.X/src/backtrace/mod.rs b/failure-1.X/src/backtrace/mod.rs
index a29e9a0..bfa65bd 100644
--- a/failure-1.X/src/backtrace/mod.rs
+++ b/failure-1.X/src/backtrace/mod.rs
@@ -1,6 +1,9 @@
 use core::fmt::{self, Debug, Display};
 
-without_std! {
+macro_rules! with_backtrace { ($($i:item)*) => ($(#[cfg(feature = "backtrace")]$i)*) }
+macro_rules! without_backtrace { ($($i:item)*) => ($(#[cfg(not(feature = "backtrace"))]$i)*) }
+
+without_backtrace! {
     /// A `Backtrace`.
     ///
     /// This is an opaque wrapper around the backtrace provided by
@@ -39,6 +42,14 @@ without_std! {
         pub fn new() -> Backtrace {
             Backtrace { _secret: () }
         }
+
+        pub(crate) fn none() -> Backtrace {
+            Backtrace { _secret: () }
+        }
+
+        pub(crate) fn is_none(&self) -> bool {
+            false
+        }
     }
 
     impl Default for Backtrace {
@@ -60,7 +71,7 @@ without_std! {
     }
 }
 
-with_std! {
+with_backtrace! {
     extern crate backtrace;
 
     mod internal;