Make ContextCompat consistent and non-ambiguous with WrapErr

eyre/src/context.rs

@@ -61,42 +61,34 @@ where
             Err(e) => Err(e.ext_report(msg())),
         }
     }
+}
 
-    #[cfg(feature = "anyhow")]
-    fn context<D>(self, msg: D) -> Result<T, Report>
+#[cfg(feature = "anyhow")]
+impl<T, E> crate::ContextCompat<T> for Result<T, E>
+where
+    Self: WrapErr<T, E>,
+{
+    #[track_caller]
+    fn context<D>(self, msg: D) -> crate::Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
     {
         self.wrap_err(msg)
     }
 
-    #[cfg(feature = "anyhow")]
-    fn with_context<D, F>(self, msg: F) -> Result<T, Report>
+    #[track_caller]
+    fn with_context<D, F>(self, f: F) -> crate::Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
         F: FnOnce() -> D,
     {
-        self.wrap_err_with(msg)
+        self.wrap_err_with(f)
     }
 }
 
 #[cfg(feature = "anyhow")]
 impl<T> crate::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>
-    where
-        D: Display + Send + Sync + 'static,
-        F: FnOnce() -> D,
-    {
-        self.with_context(msg)
-    }
-
+    #[track_caller]
     fn context<D>(self, msg: D) -> Result<T, Report>
     where
         D: Display + Send + Sync + 'static,
@@ -107,6 +99,7 @@ impl<T> crate::ContextCompat<T> for Option<T> {
         }
     }
 
+    #[track_caller]
     fn with_context<D, F>(self, msg: F) -> Result<T, Report>
     where
         D: Display + Send + Sync + 'static,

eyre/src/lib.rs

@@ -1125,21 +1125,6 @@ pub trait WrapErr<T, E>: context::private::Sealed {
     where
         D: Display + Send + Sync + 'static,
         F: FnOnce() -> D;
-
-    /// Compatibility re-export of wrap_err for interop with `anyhow`
-    #[cfg(feature = "anyhow")]
-    #[cfg_attr(track_caller, track_caller)]
-    fn context<D>(self, msg: D) -> Result<T, Report>
-    where
-        D: Display + Send + Sync + 'static;
-
-    /// Compatibility re-export of wrap_err_with for interop with `anyhow`
-    #[cfg(feature = "anyhow")]
-    #[cfg_attr(track_caller, track_caller)]
-    fn with_context<D, F>(self, f: F) -> Result<T, Report>
-    where
-        D: Display + Send + Sync + 'static,
-        F: FnOnce() -> D;
 }
 
 /// Provides the [`ok_or_eyre`][OptionExt::ok_or_eyre] method for [`Option`].
@@ -1197,7 +1182,8 @@ pub trait OptionExt<T>: context::private::Sealed {
         M: Debug + Display + Send + Sync + 'static;
 }
 
-/// Provides the `context` method for `Option` when porting from `anyhow`
+/// Provides the `context` and `with_context` methods for `Result` and `Option` to enhance
+/// compatibility when porting from anyhow.
 ///
 /// This trait is sealed and cannot be implemented for types outside of
 /// `eyre`.
@@ -1256,19 +1242,6 @@ pub trait ContextCompat<T>: context::private::Sealed {
     where
         D: Display + Send + Sync + 'static,
         F: FnOnce() -> D;
-
-    /// Compatibility re-export of `context` for porting from `anyhow` to `eyre`
-    #[cfg_attr(track_caller, track_caller)]
-    fn wrap_err<D>(self, msg: D) -> Result<T, Report>
-    where
-        D: Display + Send + Sync + 'static;
-
-    /// Compatibility re-export of `with_context` for porting from `anyhow` to `eyre`
-    #[cfg_attr(track_caller, track_caller)]
-    fn wrap_err_with<D, F>(self, f: F) -> Result<T, Report>
-    where
-        D: Display + Send + Sync + 'static,
-        F: FnOnce() -> D;
 }
 
 /// Equivalent to Ok::<_, eyre::Error>(value).

eyre/tests/test_location.rs

@@ -100,12 +100,14 @@
 #[cfg(feature = "anyhow")]
 #[test]
 fn test_context() {
+    use eyre::ContextCompat;
+
     let _ = eyre::set_hook(Box::new(|_e| {
         let expected_location = file!();
         Box::new(LocationHandler::new(expected_location))
     }));
 
     use eyre::WrapErr;
     let err = read_path("totally_fake_path")
         .context("oopsie")
         .unwrap_err();
@@ -117,12 +119,14 @@
 #[cfg(feature = "anyhow")]
 #[test]
 fn test_with_context() {
+    use eyre::ContextCompat;
+
     let _ = eyre::set_hook(Box::new(|_e| {
         let expected_location = file!();
         Box::new(LocationHandler::new(expected_location))
     }));
 
     use eyre::WrapErr;
     let err = read_path("totally_fake_path")
         .with_context(|| "oopsie")
         .unwrap_err();
@@ -140,7 +144,7 @@
     }));
 
     use eyre::ContextCompat;
-    let err = None::<()>.wrap_err("oopsie").unwrap_err();
+    let err = None::<()>.context("oopsie").unwrap_err();
 
     // should panic if the location isn't in our crate
     println!("{:?}", err);
@@ -155,7 +159,7 @@
     }));
 
     use eyre::ContextCompat;
-    let err = None::<()>.wrap_err_with(|| "oopsie").unwrap_err();
+    let err = None::<()>.with_context(|| "oopsie").unwrap_err();
 
     // should panic if the location isn't in our crate
     println!("{:?}", err);