fix: no-default-features test

eyre-rs · Nov 7, 2023 · 2629d61 · 2629d61
1 parent eedde51
commit 2629d61
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 13 deletions.
diff --git 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
@@ -36,11 +36,15 @@ Error:
       at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/std/src/panic.rs[0m:[35m133[0m
   20: [32mtest::run_test_in_process[0m[90m::h15b6b7d5919893aa[0m
       at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/test/src/lib.rs[0m:[35m608[0m
-  [96m                              ⋮ 15 frames hidden ⋮                              [0m
+  21: [32mtest::run_test::{{closure}}[0m[90m::h8ef02d13d4506b7f[0m
+      at [35m/rustc/7b4d9e155fec06583c763f176fc432dc779f1fc6/library/test/src/lib.rs[0m:[35m572[0m
+  22: [32mtest::run_test::{{closure}}[0m[90m::hcd7b423365d0ff7e[0m
+      at [35m/rustc/7b4d9e155fec06583c763f176fc432dc779f1fc6/library/test/src/lib.rs[0m:[35m600[0m
+  [96m                              ⋮ 13 frames hidden ⋮                              [0m
 
 [96mNote[0m: note
 [93mWarning[0m: warning
 [96mSuggestion[0m: suggestion
 
 Run with COLORBT_SHOW_HIDDEN=1 environment variable to disable frame filtering.
-Run with RUST_BACKTRACE=full to include source snippets.
+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
@@ -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`
 [31mThe application panicked (crashed).[0m
 Message:  [36m<non string panic payload>[0m
 Location: [35mexamples/theme_test_helper.rs[0m:[35m37[0m
 
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ BACKTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-  [96m                              ⋮ 6 frames hidden ⋮                               [0m
-   7: [32mstd::panic::panic_any[0m[90m::hb5351c0843c6c4aa[0m
-      at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/std/src/panic.rs[0m:[35m57[0m
-   8: [91mtheme_test_helper::main[0m[90m::h22b568e997946766[0m
-      at [35m/home/jlusby/git/yaahc/color-eyre/examples/theme_test_helper.rs[0m:[35m37[0m
-   9: [32mcore::ops::function::FnOnce::call_once[0m[90m::hab7662216a7cf3dc[0m
-      at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/core/src/ops/function.rs[0m:[35m227[0m
-  [96m                              ⋮ 15 frames hidden ⋮                              [0m
+  [96m                              ⋮ 7 frames hidden ⋮                               [0m
+   8: [32mstd::panic::panic_any[0m[90m::h696507828cece708[0m
+      at [35m/rustc/7b4d9e155fec06583c763f176fc432dc779f1fc6/library/std/src/panic.rs[0m:[35m63[0m
+   9: [91mtheme_test_helper::main[0m[90m::h8b0946db6f62a6fa[0m
+      at [35m/home/tei/dev/rust/color-eyre/examples/theme_test_helper.rs[0m:[35m37[0m
+  10: [32mcore::ops::function::FnOnce::call_once[0m[90m::h6e047342a35216be[0m
+      at [35m/rustc/7b4d9e155fec06583c763f176fc432dc779f1fc6/library/core/src/ops/function.rs[0m:[35m250[0m
+  [96m                              ⋮ 16 frames hidden ⋮                              [0m
 
 Run with COLORBT_SHOW_HIDDEN=1 environment variable to disable frame filtering.
 Run with RUST_BACKTRACE=full to include source snippets.