fix: color-eyre theme test suite backtraces to match the tested MSRV

eyre-rs · Jan 23, 2024 · eb26e02 · eb26e02
1 parent 1da23d9
commit eb26e02
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 48 deletions.
diff --git a/color-eyre/tests/data/theme_error_control_minimal.txt b/color-eyre/tests/data/theme_error_control_minimal.txt
@@ -6,45 +6,41 @@ Error:
 
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ BACKTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
   [96m                              ⋮ 5 frames hidden ⋮                               [0m
-   6: [91mtheme::get_error::create_report[0m[90m::h89d883b51d51a08b[0m
-      at [35m/home/jlusby/git/yaahc/color-eyre/tests/theme.rs[0m:[35m17[0m
-   7: [91mtheme::get_error::{{closure}}[0m[90m::hb62079fda66513a2[0m
-      at [35m/home/jlusby/git/yaahc/color-eyre/tests/theme.rs[0m:[35m25[0m
-   8: [32mcore::option::Option<T>::ok_or_else[0m[90m::h3227505b8a14ed22[0m
-      at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/core/src/option.rs[0m:[35m954[0m
-   9: [91mtheme::get_error[0m[90m::hd930d722dbdb6279[0m
-      at [35m/home/jlusby/git/yaahc/color-eyre/tests/theme.rs[0m:[35m25[0m
-  10: [91mtheme::test_error_backwards_compatibility[0m[90m::h920cc312bf19dc01[0m
-      at [35m/home/jlusby/git/yaahc/color-eyre/tests/theme.rs[0m:[35m43[0m
-  11: [91mtheme::test_error_backwards_compatibility::{{closure}}[0m[90m::h0c00291bcfdb63ce[0m
-      at [35m/home/jlusby/git/yaahc/color-eyre/tests/theme.rs[0m:[35m41[0m
-  12: [32mcore::ops::function::FnOnce::call_once[0m[90m::h7736c3dcb6fd829d[0m
-      at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/core/src/ops/function.rs[0m:[35m227[0m
-  13: [32mcore::ops::function::FnOnce::call_once[0m[90m::h83cc023b85256d97[0m
-      at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/core/src/ops/function.rs[0m:[35m227[0m
-  14: [32mtest::__rust_begin_short_backtrace[0m[90m::h7330e4e8b0549e26[0m
-      at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/test/src/lib.rs[0m:[35m585[0m
-  15: [32m<alloc::boxed::Box<F,A> as core::ops::function::FnOnce<Args>>::call_once[0m[90m::h6b77566b8f386abb[0m
-      at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/alloc/src/boxed.rs[0m:[35m1691[0m
-  16: [32m<core::panic::unwind_safe::AssertUnwindSafe<F> as core::ops::function::FnOnce<()>>::call_once[0m[90m::h2ad5de64df41b71c[0m
-      at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/core/src/panic/unwind_safe.rs[0m:[35m271[0m
-  17: [32mstd::panicking::try::do_call[0m[90m::he67b1e56b423a618[0m
-      at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/std/src/panicking.rs[0m:[35m403[0m
-  18: [32mstd::panicking::try[0m[90m::ha9224adcdd41a723[0m
-      at [35m/rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/std/src/panicking.rs[0m:[35m367[0m
-  19: [32mstd::panic::catch_unwind[0m[90m::h9111b58ae0b27828[0m
-      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
-  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
+   6: [91mtheme::get_error::create_report[0m[90m::h43540daddae98383[0m
+      at [35m/home/freja/dev/rust/eyre/color-eyre/tests/theme.rs[0m:[35m17[0m
+   7: [91mtheme::get_error::{{closure}}[0m[90m::h40bbef2f4cd93fab[0m
+      at [35m/home/freja/dev/rust/eyre/color-eyre/tests/theme.rs[0m:[35m26[0m
+   8: [32mcore::option::Option<T>::ok_or_else[0m[90m::h8aa47839ff49cfbe[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/core/src/option.rs[0m:[35m1087[0m
+   9: [91mtheme::get_error[0m[90m::h78b5b4d52bfbbad0[0m
+      at [35m/home/freja/dev/rust/eyre/color-eyre/tests/theme.rs[0m:[35m26[0m
+  10: [91mtheme::test_error_backwards_compatibility[0m[90m::h9de398ce80defffa[0m
+      at [35m/home/freja/dev/rust/eyre/color-eyre/tests/theme.rs[0m:[35m45[0m
+  11: [91mtheme::test_error_backwards_compatibility::{{closure}}[0m[90m::hbe7b8ad2562c4dc4[0m
+      at [35m/home/freja/dev/rust/eyre/color-eyre/tests/theme.rs[0m:[35m43[0m
+  12: [32mcore::ops::function::FnOnce::call_once[0m[90m::hfc715417a1b707c5[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/core/src/ops/function.rs[0m:[35m248[0m
+  13: [32mcore::ops::function::FnOnce::call_once[0m[90m::h9ee1367930602049[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/core/src/ops/function.rs[0m:[35m248[0m
+  14: [32mtest::__rust_begin_short_backtrace[0m[90m::h35061c5e0f5ad5d6[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/test/src/lib.rs[0m:[35m572[0m
+  15: [32m<alloc::boxed::Box<F,A> as core::ops::function::FnOnce<Args>>::call_once[0m[90m::h98fe3dd14bfe63ea[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/alloc/src/boxed.rs[0m:[35m1940[0m
+  16: [32m<core::panic::unwind_safe::AssertUnwindSafe<F> as core::ops::function::FnOnce<()>>::call_once[0m[90m::h3ab012fb764e8d57[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/core/src/panic/unwind_safe.rs[0m:[35m271[0m
+  17: [32mstd::panicking::try::do_call[0m[90m::h810a5ea64fd04126[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/std/src/panicking.rs[0m:[35m492[0m
+  18: [32mstd::panicking::try[0m[90m::h0b213f9a8c1fe629[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/std/src/panicking.rs[0m:[35m456[0m
+  19: [32mstd::panic::catch_unwind[0m[90m::h00f746771ade371f[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/std/src/panic.rs[0m:[35m137[0m
+  20: [32mtest::run_test_in_process[0m[90m::h5645647f0d0a3da3[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/test/src/lib.rs[0m:[35m595[0m
+  [96m                              ⋮ 15 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/color-eyre/tests/data/theme_panic_control_no_spantrace.txt b/color-eyre/tests/data/theme_panic_control_no_spantrace.txt
@@ -1,19 +1,17 @@
-    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`
+    Finished dev [unoptimized + debuginfo] target(s) in 0.07s
+     Running `/home/freja/dev/rust/eyre/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
+Location: [35mcolor-eyre/examples/theme_test_helper.rs[0m:[35m38[0m
 
   ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ BACKTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
-  [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                              ⋮ 6 frames hidden ⋮                               [0m
+   7: [32mstd::panic::panic_any[0m[90m::h4a05c03c4d0c389c[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/std/src/panic.rs[0m:[35m61[0m
+   8: [91mtheme_test_helper::main[0m[90m::hfc653b28cad3659d[0m
+      at [35m/home/freja/dev/rust/eyre/color-eyre/examples/theme_test_helper.rs[0m:[35m38[0m
+   9: [32mcore::ops::function::FnOnce::call_once[0m[90m::hb0110cdf4417a5ed[0m
+      at [35m/rustc/897e37553bba8b42751c67658967889d11ecd120/library/core/src/ops/function.rs[0m:[35m248[0m
   [96m                              ⋮ 16 frames hidden ⋮                              [0m
 
 Run with COLORBT_SHOW_HIDDEN=1 environment variable to disable frame filtering.