Merge commit '4a5297d30b0f0754a3bbc47b71bb55b04960c0ad' into color-eyre

eyre-rs · Dec 11, 2023 · e3fd620 · e3fd620
2 parents 57216d0 + 4a5297d
commit e3fd620
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 34 deletions.
diff --git a/color-eyre/examples/multiple_errors.rs b/color-eyre/examples/multiple_errors.rs
@@ -12,13 +12,15 @@ fn join_errors(results: Vec<Result<(), SourceError>>) -> Result<(), Report> {
         return Ok(());
     }
 
-    results
+    let err = results
         .into_iter()
         .filter(Result::is_err)
         .map(Result::unwrap_err)
-        .fold(Err(eyre!("encountered multiple errors")), |report, e| {
+        .fold(eyre!("encountered multiple errors"), |report, e| {
             report.error(e)
-        })
+        });
+
+    Err(err)
 }
 
 /// Helper function to generate errors

diff --git a/color-eyre/src/config.rs b/color-eyre/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))
     }
@@ -1038,6 +1037,13 @@ pub struct EyreHook {
     issue_filter: Arc<IssueFilterCallback>,
 }
 
+type HookFunc = Box<
+    dyn Fn(&(dyn std::error::Error + 'static)) -> Box<dyn eyre::EyreHandler>
+        + Send
+        + Sync
+        + 'static,
+>;
+
 impl EyreHook {
     #[allow(unused_variables)]
     pub(crate) fn default(&self, error: &(dyn std::error::Error + 'static)) -> crate::Handler {
@@ -1091,14 +1097,7 @@ impl EyreHook {
     }
 
     /// Convert the self into the boxed type expected by `eyre::set_hook`.
-    pub fn into_eyre_hook(
-        self,
-    ) -> Box<
-        dyn Fn(&(dyn std::error::Error + 'static)) -> Box<dyn eyre::EyreHandler>
-            + Send
-            + Sync
-            + 'static,
-    > {
+    pub fn into_eyre_hook(self) -> HookFunc {
         Box::new(move |e| Box::new(self.default(e)))
     }
 }

diff --git a/color-eyre/src/lib.rs b/color-eyre/src/lib.rs
@@ -349,8 +349,6 @@
     overflowing_literals,
     path_statements,
     patterns_in_fns_without_body,
-    private_in_public,
-    unconditional_recursion,
     unused,
     unused_allocation,
     unused_comparisons,

diff --git a/color-eyre/tests/data/theme_error_control.txt b/color-eyre/tests/data/theme_error_control.txt
@@ -44,11 +44,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/color-eyre/tests/data/theme_error_control_location.txt b/color-eyre/tests/data/theme_error_control_location.txt
@@ -39,11 +39,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/color-eyre/tests/data/theme_error_control_minimal.txt b/color-eyre/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/color-eyre/tests/data/theme_error_control_spantrace.txt b/color-eyre/tests/data/theme_error_control_spantrace.txt
@@ -41,11 +41,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/color-eyre/tests/data/theme_panic_control_no_spantrace.txt b/color-eyre/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.
diff --git a/color-eyre/tests/theme.rs b/color-eyre/tests/theme.rs
@@ -119,7 +119,7 @@ fn test_panic_backwards_compatibility() {
     };
 
     let output = std::process::Command::new("cargo")
-        .args(&["run", "--example", "theme_test_helper"])
+        .args(["run", "--example", "theme_test_helper"])
         .arg("--no-default-features")
         .args(&features)
         .output()
@@ -152,7 +152,6 @@ fn test_backwards_compatibility(target: String, file_name: &str) {
         let all: Vec<_> = s.ansi_parse().collect();
         let ansi: Vec<_> = s
             .ansi_parse()
-            .into_iter()
             .filter_map(|x| {
                 if let Output::Escape(ansi) = x {
                     Some(ansi)
@@ -167,6 +166,7 @@ fn test_backwards_compatibility(target: String, file_name: &str) {
     let (_control_tokens, control_ansi) = f(&control);
     let (_target_tokens, target_ansi) = f(&target);
 
+    // pretty_assertions::assert_eq!(target, control);
     let msg = [
         // comment out / un-comment what you need or don't need for debugging (see below for more instructions):