ref: Remove deprecated error-chain and failure crates (#290)

Author: Swatinem

.github/workflows/ci.yml

@@ -24,8 +24,6 @@ jobs:
           components: rustfmt, clippy
 
       - uses: Swatinem/rust-cache@v1
-        with:
-          key: lints
 
       - name: Run cargo fmt
         uses: actions-rs/cargo@v1
@@ -64,8 +62,6 @@ jobs:
           override: true
 
       - uses: Swatinem/rust-cache@v1
-        with:
-          key: check
 
       - run: make checkall
 
@@ -91,8 +87,6 @@ jobs:
           override: true
 
       - uses: Swatinem/rust-cache@v1
-        with:
-          key: test
 
       - name: Run cargo test
         uses: actions-rs/cargo@v1
@@ -125,8 +119,6 @@ jobs:
           override: true
 
       - uses: Swatinem/rust-cache@v1
-        with:
-          key: fast-MSRV
 
       - run: make checkfast
 

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## Unreleased
+
+**Breaking Changes**:
+
+- The deprecated `error-chain` and `failure` integrations, features and crates were removed.
+
 ## 0.21.0
 
 **Breaking Changes**:

Cargo.toml

@@ -7,8 +7,6 @@ members = [
     "sentry-contexts",
     "sentry-core",
     "sentry-debug-images",
-    "sentry-error-chain",
-    "sentry-failure",
     "sentry-log",
     "sentry-panic",
     "sentry-slog",

Makefile

@@ -53,7 +53,7 @@ testall:
 checkfast: check-no-default-features check-default-features
 .PHONY: checkfast
 
-checkall: check-all-features check-no-default-features check-default-features check-failure check-panic check-all-impls check-curl-transport check-actix
+checkall: check-all-features check-no-default-features check-default-features check-panic check-curl-transport check-actix
 .PHONY: checkall
 
 check-all-features:
@@ -71,21 +71,11 @@ check-no-default-features:
 	@cd sentry && RUSTFLAGS=-Dwarnings cargo check --no-default-features
 .PHONY: check-no-default-features
 
-check-failure:
-	@echo 'NO CLIENT + FAILURE'
-	@cd sentry && RUSTFLAGS=-Dwarnings cargo check --no-default-features --features 'failure'
-.PHONY: check-failure
-
 check-panic:
 	@echo 'NO CLIENT + PANIC'
 	@cd sentry && RUSTFLAGS=-Dwarnings cargo check --no-default-features --features 'panic'
 .PHONY: check-panic
 
-check-all-impls:
-	@echo 'NO CLIENT + ALL IMPLS'
-	@cd sentry && RUSTFLAGS=-Dwarnings cargo check --no-default-features --features 'failure,panic'
-.PHONY: check-all-impls
-
 check-curl-transport:
 	@echo 'CURL TRANSPORT'
 	@cd sentry && RUSTFLAGS=-Dwarnings cargo check --features curl

sentry-backtrace/src/trim.rs

@@ -26,11 +26,6 @@ lazy_static::lazy_static! {
         "anyhow::",
         "<sentry_log::Logger as log::Log>::log",
     ];
-
-    // TODO: remove all of this together with the deprecated `error_chain` support
-    static ref SECONDARY_BORDER_FRAMES: Vec<(&'static str, &'static str)> = vec![
-        ("error_chain::make_backtrace", "<T as core::convert::Into<U>>::into")
-    ];
 }
 
 /// A helper function to trim a stacktrace.
@@ -48,42 +43,8 @@ where
         });
 
     if let Some(cutoff) = known_cutoff {
-        let secondary = {
-            let func = stacktrace.frames[stacktrace.frames.len() - cutoff - 1]
-                .function
-                .as_ref()
-                .unwrap();
-
-            SECONDARY_BORDER_FRAMES
-                .iter()
-                .filter_map(|&(primary, secondary)| {
-                    if function_starts_with(func, primary) {
-                        Some(secondary)
-                    } else {
-                        None
-                    }
-                })
-                .next()
-        };
         let trunc = stacktrace.frames.len() - cutoff - 1;
         stacktrace.frames.truncate(trunc);
-
-        if let Some(secondary) = secondary {
-            let secondary_cutoff =
-                stacktrace
-                    .frames
-                    .iter()
-                    .rev()
-                    .position(|frame| match frame.function {
-                        Some(ref func) => function_starts_with(&func, secondary),
-                        None => false,
-                    });
-
-            if let Some(cutoff) = secondary_cutoff {
-                let trunc = stacktrace.frames.len() - cutoff - 1;
-                stacktrace.frames.truncate(trunc);
-            }
-        }
     }
 }