Switch report handler to a global hook

Cargo.toml

@@ -24,6 +24,7 @@ anyhow = "1.0.28"
 
 [dependencies]
 indenter = "0.3.0"
+once_cell = "1.4.0"
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

src/context.rs

@@ -1,5 +1,5 @@
 use crate::error::ContextError;
-use crate::{ContextCompat, EyreHandler, Report, StdError, WrapErr};
+use crate::{ContextCompat, Report, StdError, WrapErr};
 use core::fmt::{self, Debug, Display, Write};
 
 #[cfg(backtrace)]
@@ -8,34 +8,27 @@ use std::backtrace::Backtrace;
 mod ext {
     use super::*;
 
-    pub trait StdError<H>
-    where
-        H: EyreHandler,
-    {
-        fn ext_report<D>(self, msg: D) -> Report<H>
+    pub trait StdError {
+        fn ext_report<D>(self, msg: D) -> Report
         where
             D: Display + Send + Sync + 'static;
     }
 
     #[cfg(feature = "std")]
-    impl<E, H> StdError<H> for E
+    impl<E> StdError for E
     where
-        H: EyreHandler,
         E: std::error::Error + Send + Sync + 'static,
     {
-        fn ext_report<D>(self, msg: D) -> Report<H>
+        fn ext_report<D>(self, msg: D) -> Report
         where
             D: Display + Send + Sync + 'static,
         {
             Report::from_msg(msg, self)
         }
     }
 
-    impl<H> StdError<H> for Report<H>
-    where
-        H: EyreHandler,
-    {
-        fn ext_report<D>(self, msg: D) -> Report<H>
+    impl StdError for Report {
+        fn ext_report<D>(self, msg: D) -> Report
         where
             D: Display + Send + Sync + 'static,
         {
@@ -44,34 +37,33 @@ mod ext {
     }
 }
 
-impl<T, E, H> WrapErr<T, E, H> for Result<T, E>
+impl<T, E> WrapErr<T, E> for Result<T, E>
 where
-    H: EyreHandler,
-    E: ext::StdError<H> + Send + Sync + 'static,
+    E: ext::StdError + Send + Sync + 'static,
 {
-    fn wrap_err<D>(self, msg: D) -> Result<T, Report<H>>
+    fn wrap_err<D>(self, msg: D) -> Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
     {
         self.map_err(|error| error.ext_report(msg))
     }
 
-    fn wrap_err_with<D, F>(self, msg: F) -> Result<T, Report<H>>
+    fn wrap_err_with<D, F>(self, msg: F) -> Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
         F: FnOnce() -> D,
     {
         self.map_err(|error| error.ext_report(msg()))
     }
 
-    fn context<D>(self, msg: D) -> Result<T, Report<H>>
+    fn context<D>(self, msg: D) -> Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
     {
         self.wrap_err(msg)
     }
 
-    fn with_context<D, F>(self, msg: F) -> Result<T, Report<H>>
+    fn with_context<D, F>(self, msg: F) -> Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
         F: FnOnce() -> D,
@@ -80,33 +72,30 @@ where
     }
 }
 
-impl<T, H> ContextCompat<T, H> for Option<T>
-where
-    H: EyreHandler,
-{
-    fn wrap_err<D>(self, msg: D) -> Result<T, Report<H>>
+impl<T> ContextCompat<T> for Option<T> {
+    fn wrap_err<D>(self, msg: D) -> Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
     {
         self.context(msg)
     }
 
-    fn wrap_err_with<D, F>(self, msg: F) -> Result<T, Report<H>>
+    fn wrap_err_with<D, F>(self, msg: F) -> Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
         F: FnOnce() -> D,
     {
         self.with_context(msg)
     }
 
-    fn context<D>(self, msg: D) -> Result<T, Report<H>>
+    fn context<D>(self, msg: D) -> Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
     {
         self.ok_or_else(|| Report::from_display(msg))
     }
 
-    fn with_context<D, F>(self, msg: F) -> Result<T, Report<H>>
+    fn with_context<D, F>(self, msg: F) -> Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
         F: FnOnce() -> D,
@@ -152,9 +141,8 @@ where
     }
 }
 
-impl<D, H> StdError for ContextError<D, Report<H>>
+impl<D> StdError for ContextError<D, Report>
 where
-    H: EyreHandler,
     D: Display,
 {
     fn source(&self) -> Option<&(dyn StdError + 'static)> {
@@ -185,8 +173,8 @@ impl Write for Quoted<&mut fmt::Formatter<'_>> {
 pub(crate) mod private {
     use super::*;
 
-    pub trait Sealed<H: EyreHandler> {}
+    pub trait Sealed {}
 
-    impl<T, E, H: EyreHandler> Sealed<H> for Result<T, E> where E: ext::StdError<H> {}
-    impl<T, H: EyreHandler> Sealed<H> for Option<T> {}
+    impl<T, E> Sealed for Result<T, E> where E: ext::StdError {}
+    impl<T> Sealed for Option<T> {}
 }