Remove experimental failure support

Resolves #34
athre0z · Oct 13, 2020 · a7240e7 · a7240e7
1 parent c68832a
commit a7240e7
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 139 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## Unreleased
+
+- Add `__rust_begin_short_backtrace` filter
+- Remove experimental failure support
+
 ## [v0.4.2] (2020-05-19)
 
 #### Added

diff --git a/Cargo.toml b/Cargo.toml
@@ -16,17 +16,11 @@ keywords = [
     "pretty",
 ]
 
-[[example]]
-name = "failure"
-required-features = ["failure-bt"]
-
 [features]
 default = ["gimli-symbolize"]
-failure-bt = ["failure"]
 gimli-symbolize = ["backtrace/gimli-symbolize"]
 
 [dependencies]
 termcolor = "1.0"
 atty = "0.2"
-failure = { version = "0.1", optional = true }
 backtrace = "0.3"
diff --git a/README.md b/README.md
@@ -41,29 +41,6 @@ BacktracePrinter::new().message("Custom message!").install(default_output_stream
 - Hide all the frames after the panic was already initiated
 - Hide language runtime initialization frames
 
-### Optional Features
-
-- **`failure-bt`** — Experimental support for printing `failure::Backtrace` backtraces.
-
-### **Experimental** Failure backtrace integration
-
-`failure` backtraces are opaque and so this feature uses unsafe code to
-transmute the struct into a non private struct to allow access to the internal
-`backtrace::Backtrace` object.
-
-The code is dependent on and only tested against failure version `0.1.5` and is
-considered a temporary hack while we work on getting backtraces from errors
-exposed properly. This feature is marked as unsafe, it relies on UB to work,
-and there is no guarantee that rust will pick this layout on a different crate
-type. User discretion is advised.
-
-To enable, include the following in your Cargo.toml
-
-```toml
-[dependencies]
-color-backtrace = { version = "0.4", features = ["failure-bt"] }
-```
-
 ### Reducing transitive dependencies
 
 In order to reduce transitive dependencies, you can disable the default

diff --git a/examples/failure.rs b/examples/failure.rs
diff --git a/src/failure.rs b/src/failure.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -44,9 +44,6 @@ use std::path::PathBuf;
 use std::sync::{Arc, Mutex};
 use termcolor::{Ansi, Color, ColorChoice, ColorSpec, StandardStream, WriteColor};
 
-#[cfg(feature = "failure-bt")]
-pub mod failure;
-
 // Re-export termcolor so users don't have to depend on it themselves.
 pub use termcolor;
 
@@ -230,10 +227,7 @@ impl Frame {
             "color_backtrace::create_panic_handler",
             "std::panicking::begin_panic",
             "begin_panic_fmt",
-            "failure::backtrace::Backtrace::new",
             "backtrace::capture",
-            "failure::error_message::err_msg",
-            "<failure::error::Error as core::convert::From<F>>::from",
         ];
 
         match self.name.as_ref() {
@@ -651,23 +645,6 @@ impl BacktracePrinter {
         Ok(())
     }
 
-    /// Extracts the internal `backtrace::Backtrace` from a `failure::Backtrace` and prints it, if
-    /// one exists. Prints that a backtrace was not capture if one is not found.
-    #[cfg(feature = "failure-bt")]
-    pub unsafe fn print_failure_trace(
-        &self,
-        trace: &::failure::Backtrace,
-        out: &mut impl WriteColor,
-    ) -> IOResult {
-        let internal = failure::backdoortrace(trace);
-
-        if let Some(internal) = internal {
-            self.print_trace(internal, out)
-        } else {
-            writeln!(out, "<failure backtrace not captured>")
-        }
-    }
-
     /// Pretty-print a backtrace to a `String`, using VT100 color codes.
     pub fn format_trace_to_string(&self, trace: &backtrace::Backtrace) -> IOResult<String> {
         // TODO: should we implicitly enable VT100 support on Windows here?