From 3df3e93fb62659f7592d1cfabff800e5e07f82c3 Mon Sep 17 00:00:00 2001 From: Jane Lusby Date: Wed, 12 Jan 2022 16:09:26 -0800 Subject: [PATCH] integrate color-spantrace release --- Cargo.toml | 6 +++--- tests/data/theme_error_control.txt | 24 ++++++++++++------------ tests/data/theme_panic_control.txt | 10 +++++----- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 2a10295..c8d71a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "color-eyre" -version = "0.6.0" +version = "0.5.11" authors = ["Jane Lusby "] edition = "2018" license = "MIT OR Apache-2.0" @@ -22,8 +22,8 @@ eyre = "0.6.1" tracing-error = { version = "0.2.0", optional = true } backtrace = { version = "0.3.48", features = ["gimli-symbolize"] } indenter = "0.3.0" -owo-colors = "1.2.1" -color-spantrace = { version = "0.1.6", optional = true, git = "https://github.com/asonix/color-spantrace", branch = "asonix/update-tracing-error" } +owo-colors = "3.2.0" +color-spantrace = { version = "0.2", optional = true } once_cell = "1.4.0" url = { version = "2.1.1", optional = true } diff --git a/tests/data/theme_error_control.txt b/tests/data/theme_error_control.txt index daf7dfa..ec3c1f0 100644 --- a/tests/data/theme_error_control.txt +++ b/tests/data/theme_error_control.txt @@ -14,19 +14,19 @@ Error: ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ BACKTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━  ⋮ 5 frames hidden ⋮  - 6: theme::get_error::create_report::hd9d97e4e76dee44c - at /home/asonix/Development/rust/color-eyre/tests/theme.rs:17 - 7: theme::get_error::{{closure}}::h4cc7ce7893f295cb - at /home/asonix/Development/rust/color-eyre/tests/theme.rs:25 - 8: core::option::Option::ok_or_else::hc00ef515ea43ef82 + 6: theme::get_error::create_report::hdb41452bef3fc05d + at /home/jlusby/git/yaahc/color-eyre/tests/theme.rs:17 + 7: theme::get_error::{{closure}}::h739c7fe800e2d03f + at /home/jlusby/git/yaahc/color-eyre/tests/theme.rs:25 + 8: core::option::Option::ok_or_else::hd8e670bbca63e94a at /rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/core/src/option.rs:954 - 9: theme::get_error::haf4b483cac8d076b - at /home/asonix/Development/rust/color-eyre/tests/theme.rs:25 - 10: theme::test_error_backwards_compatibility::hf4c9eaf012b11366 - at /home/asonix/Development/rust/color-eyre/tests/theme.rs:43 - 11: theme::test_error_backwards_compatibility::{{closure}}::h972249b6ebd599cb - at /home/asonix/Development/rust/color-eyre/tests/theme.rs:41 - 12: core::ops::function::FnOnce::call_once::h8855848bc65b81ec + 9: theme::get_error::h2f751f4927c6fecb + at /home/jlusby/git/yaahc/color-eyre/tests/theme.rs:25 + 10: theme::test_error_backwards_compatibility::hfc4be9f22c32535c + at /home/jlusby/git/yaahc/color-eyre/tests/theme.rs:43 + 11: theme::test_error_backwards_compatibility::{{closure}}::hb001a9a908f0f5a4 + at /home/jlusby/git/yaahc/color-eyre/tests/theme.rs:41 + 12: core::ops::function::FnOnce::call_once::he26938a69d361bf6 at /rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/core/src/ops/function.rs:227 13: core::ops::function::FnOnce::call_once::h83cc023b85256d97 at /rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/core/src/ops/function.rs:227 diff --git a/tests/data/theme_panic_control.txt b/tests/data/theme_panic_control.txt index 1ee72f4..fe925b4 100644 --- a/tests/data/theme_panic_control.txt +++ b/tests/data/theme_panic_control.txt @@ -1,4 +1,4 @@ - Finished dev [unoptimized + debuginfo] target(s) in 0.02s + Finished dev [unoptimized + debuginfo] target(s) in 0.03s Running `target/debug/examples/theme_test_helper` The application panicked (crashed). Message:  @@ -11,11 +11,11 @@ Location: examples/theme_test_helper.rs:37 ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ BACKTRACE ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━  ⋮ 6 frames hidden ⋮  - 7: std::panic::panic_any::hdb02375f91faf2b1 + 7: std::panic::panic_any::hd76a7f826307234c at /rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/std/src/panic.rs:57 - 8: theme_test_helper::main::hc643d5b602546a09 - at /home/asonix/Development/rust/color-eyre/examples/theme_test_helper.rs:37 - 9: core::ops::function::FnOnce::call_once::hb05b32a2aa2386ee + 8: theme_test_helper::main::h767d3fd6c45048c8 + at /home/jlusby/git/yaahc/color-eyre/examples/theme_test_helper.rs:37 + 9: core::ops::function::FnOnce::call_once::hc5a1cd4127189dad at /rustc/f1edd0429582dd29cccacaf50fd134b05593bd9c/library/core/src/ops/function.rs:227  ⋮ 15 frames hidden ⋮