From 2629d614a8d3a79be79cd49e80564fa3300f1daf Mon Sep 17 00:00:00 2001
From: Tei Roberts <ten3roberts@gmail.com>
Date: Wed, 8 Nov 2023 00:29:49 +0100
Subject: [PATCH] fix: no-default-features test

---
 src/config.rs                                 |  3 +--
 tests/data/theme_error_control_minimal.txt    |  8 ++++++--
 .../data/theme_panic_control_no_spantrace.txt | 20 ++++++++++---------
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/config.rs b/src/config.rs
index ea26597..01a5c74 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -4,7 +4,6 @@ use crate::{
     section::PanicMessage,
     writers::{EnvSection, WriterExt},
 };
-use eyre::WrapErr;
 use fmt::Display;
 use indenter::{indented, Format};
 use owo_colors::{style, OwoColorize, Style};
@@ -760,7 +759,7 @@ impl HookBuilder {
         };
 
         #[cfg(feature = "capture-spantrace")]
-        color_spantrace::set_theme(self.theme.into()).wrap_err("could not set the provided `Theme` via `color_spantrace::set_theme` globally as another was already set")?;
+        eyre::WrapErr::wrap_err(color_spantrace::set_theme(self.theme.into()), "could not set the provided `Theme` via `color_spantrace::set_theme` globally as another was already set")?;
 
         Ok((panic_hook, eyre_hook))
     }
diff --git a/tests/data/theme_error_control_minimal.txt b/tests/data/theme_error_control_minimal.txt
index 0df50fb..684d048 100644
--- a/tests/data/theme_error_control_minimal.txt
+++ b/tests/data/theme_error_control_minimal.txt
@@ -36,11 +36,15 @@ Error:
       at /rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/std/src/panic.rs:133
   20: test::run_test_in_process::h15b6b7d5919893aa
       at /rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/test/src/lib.rs:608
-                                ⋮ 15 frames hidden ⋮                              
+  21: test::run_test::{{closure}}::h8ef02d13d4506b7f
+      at /rustc/7b4d9e155fec06583c763f176fc432dc779f1fc6/library/test/src/lib.rs:572
+  22: test::run_test::{{closure}}::hcd7b423365d0ff7e
+      at /rustc/7b4d9e155fec06583c763f176fc432dc779f1fc6/library/test/src/lib.rs:600
+                                ⋮ 13 frames hidden ⋮                              
 
 Note: note
 Warning: warning
 Suggestion: suggestion
 
 Run with COLORBT_SHOW_HIDDEN=1 environment variable to disable frame filtering.
-Run with RUST_BACKTRACE=full to include source snippets.
\ No newline at end of file
+Run with RUST_BACKTRACE=full to include source snippets.
diff --git a/tests/data/theme_panic_control_no_spantrace.txt b/tests/data/theme_panic_control_no_spantrace.txt
index bac190d..95aa739 100644
--- a/tests/data/theme_panic_control_no_spantrace.txt
+++ b/tests/data/theme_panic_control_no_spantrace.txt
@@ -1,18 +1,20 @@
-    Finished dev [unoptimized + debuginfo] target(s) in 0.02s
+    Finished dev [unoptimized + debuginfo] target(s) in 0.03s
+warning: the following packages contain code that will be rejected by a future version of Rust: nom v4.2.3
+note: to see what the problems were, use the option `--future-incompat-report`, or run `cargo report future-incompatibilities --id 1`
      Running `target/debug/examples/theme_test_helper`
 The application panicked (crashed).
 Message:  <non string panic payload>
 Location: examples/theme_test_helper.rs:37
 
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ BACKTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-                                ⋮ 6 frames hidden ⋮                               
-   7: std::panic::panic_any::hb5351c0843c6c4aa
-      at /rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/std/src/panic.rs:57
-   8: theme_test_helper::main::h22b568e997946766
-      at /home/jlusby/git/yaahc/color-eyre/examples/theme_test_helper.rs:37
-   9: core::ops::function::FnOnce::call_once::hab7662216a7cf3dc
-      at /rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/core/src/ops/function.rs:227
-                                ⋮ 15 frames hidden ⋮                              
+                                ⋮ 7 frames hidden ⋮                               
+   8: std::panic::panic_any::h696507828cece708
+      at /rustc/7b4d9e155fec06583c763f176fc432dc779f1fc6/library/std/src/panic.rs:63
+   9: theme_test_helper::main::h8b0946db6f62a6fa
+      at /home/tei/dev/rust/color-eyre/examples/theme_test_helper.rs:37
+  10: core::ops::function::FnOnce::call_once::h6e047342a35216be
+      at /rustc/7b4d9e155fec06583c763f176fc432dc779f1fc6/library/core/src/ops/function.rs:250
+                                ⋮ 16 frames hidden ⋮                              
 
 Run with COLORBT_SHOW_HIDDEN=1 environment variable to disable frame filtering.
 Run with RUST_BACKTRACE=full to include source snippets.