Merge pull request #173 from dtolnay/newadhoc

Replace macro-generated calls to new_adhoc with Error::msg public API

src/lib.rs

@@ -613,9 +613,6 @@ pub trait Context<T, E>: context::private::Sealed {
 // Not public API. Referenced by macro-generated code.
 #[doc(hidden)]
 pub mod private {
-    use crate::Error;
-    use core::fmt::{Debug, Display};
-
     pub use core::result::Result::Err;
 
     #[doc(hidden)]
@@ -626,14 +623,6 @@ pub mod private {
         pub use crate::kind::BoxedKind;
     }
 
-    #[cold]
-    pub fn new_adhoc<M>(message: M) -> Error
-    where
-        M: Display + Debug + Send + Sync + 'static,
-    {
-        Error::from_adhoc(message, backtrace!())
-    }
-
     #[cfg(anyhow_no_macro_reexport)]
     pub use crate::{__anyhow_concat as concat, __anyhow_stringify as stringify};
     #[cfg(not(anyhow_no_macro_reexport))]

src/macros.rs

@@ -115,7 +115,7 @@ macro_rules! bail {
 macro_rules! ensure {
     ($cond:expr $(,)?) => {
         if !$cond {
-            return $crate::private::Err($crate::private::new_adhoc(
+            return $crate::private::Err($crate::Error::msg(
                 $crate::private::concat!("Condition failed: `", $crate::private::stringify!($cond), "`")
             ));
         }
@@ -170,7 +170,7 @@ macro_rules! anyhow {
     ($msg:literal $(,)?) => {
         // Handle $:literal as a special case to make cargo-expanded code more
         // concise in the common case.
-        $crate::private::new_adhoc($msg)
+        $crate::Error::msg($msg)
     };
     ($err:expr $(,)?) => ({
         use $crate::private::kind::*;
@@ -179,6 +179,6 @@ macro_rules! anyhow {
         }
     });
     ($fmt:expr, $($arg:tt)*) => {
-        $crate::private::new_adhoc(format!($fmt, $($arg)*))
+        $crate::Error::msg(format!($fmt, $($arg)*))
     };
 }