From 4cbe6b69eaccf23297b51f9584dd8a7d5e12ea95 Mon Sep 17 00:00:00 2001
From: Martin Nordholts <enselic@gmail.com>
Date: Mon, 6 May 2024 23:29:14 +0200
Subject: [PATCH] Remove unused `libbacktrace` and `gimli-symbolize` features
 (rust-lang/backtrace-rs#615)

---
 .github/workflows/main.yml          | 4 ++--
 Cargo.toml                          | 2 --
 crates/line-tables-only/Cargo.toml  | 4 ----
 crates/without_debuginfo/Cargo.toml | 4 ----
 src/symbolize/mod.rs                | 2 +-
 5 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 30253a74d..6ed2863cf 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -73,8 +73,8 @@ jobs:
       env:
         CARGO_PROFILE_DEV_SPLIT_DEBUGINFO: packed
         CARGO_PROFILE_TEST_SPLIT_DEBUGINFO: packed
-    - run: cargo test --features gimli-symbolize --manifest-path crates/without_debuginfo/Cargo.toml
-    - run: cargo test --manifest-path crates/line-tables-only/Cargo.toml --features gimli-symbolize
+    - run: cargo test --manifest-path crates/without_debuginfo/Cargo.toml
+    - run: cargo test --manifest-path crates/line-tables-only/Cargo.toml
 
     # Test debuginfo compression still works
     - run: cargo test
diff --git a/Cargo.toml b/Cargo.toml
index 5c34bdef0..e6c6b02f9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -79,9 +79,7 @@ coresymbolication = []
 dbghelp = []
 dl_iterate_phdr = []
 dladdr = []
-gimli-symbolize = []
 kernel32 = []
-libbacktrace = []
 libunwind = []
 unix-backtrace = []
 verify-winapi = [
diff --git a/crates/line-tables-only/Cargo.toml b/crates/line-tables-only/Cargo.toml
index 8d17db58c..4aa28f6a0 100644
--- a/crates/line-tables-only/Cargo.toml
+++ b/crates/line-tables-only/Cargo.toml
@@ -15,7 +15,3 @@ features = [
   'libunwind',
   'std',
 ]
-
-[features]
-libbacktrace = ['backtrace/libbacktrace']
-gimli-symbolize = ['backtrace/gimli-symbolize']
diff --git a/crates/without_debuginfo/Cargo.toml b/crates/without_debuginfo/Cargo.toml
index 38e559971..b8c939414 100644
--- a/crates/without_debuginfo/Cargo.toml
+++ b/crates/without_debuginfo/Cargo.toml
@@ -14,7 +14,3 @@ debug = false
 
 [profile.test]
 debug = false
-
-[features]
-libbacktrace = ['backtrace/libbacktrace']
-gimli-symbolize = ['backtrace/gimli-symbolize']
diff --git a/src/symbolize/mod.rs b/src/symbolize/mod.rs
index b01fe86d6..3f5e2f1c5 100644
--- a/src/symbolize/mod.rs
+++ b/src/symbolize/mod.rs
@@ -453,7 +453,7 @@ cfg_if::cfg_if! {
 /// While this function is always available it doesn't actually do anything on
 /// most implementations. Libraries like dbghelp or libbacktrace do not provide
 /// facilities to deallocate state and manage the allocated memory. For now the
-/// `gimli-symbolize` feature of this crate is the only feature where this
+/// `std` feature of this crate is the only feature where this
 /// function has any effect.
 #[cfg(feature = "std")]
 pub fn clear_symbol_cache() {