Make private module more clearly private

Author: dtolnay

src/ensure.rs

@@ -788,15 +788,15 @@ macro_rules! __fancy_ensure {
             (lhs, rhs) => {
                 if !(lhs $op rhs) {
                     #[allow(unused_imports)]
-                    use $crate::private::{BothDebug, NotBothDebug};
+                    use $crate::__private::{BothDebug, NotBothDebug};
                     return Err((lhs, rhs).__dispatch_ensure(
-                        $crate::private::concat!(
+                        $crate::__private::concat!(
                             "Condition failed: `",
-                            $crate::private::stringify!($lhs),
+                            $crate::__private::stringify!($lhs),
                             " ",
-                            $crate::private::stringify!($op),
+                            $crate::__private::stringify!($op),
                             " ",
-                            $crate::private::stringify!($rhs),
+                            $crate::__private::stringify!($rhs),
                             "`",
                         ),
                     ));
@@ -811,24 +811,24 @@ macro_rules! __fancy_ensure {
 macro_rules! __fallback_ensure {
     ($cond:expr $(,)?) => {
         if !$cond {
-            return $crate::private::Err($crate::Error::msg(
-                $crate::private::concat!("Condition failed: `", $crate::private::stringify!($cond), "`")
+            return $crate::__private::Err($crate::Error::msg(
+                $crate::__private::concat!("Condition failed: `", $crate::__private::stringify!($cond), "`")
             ));
         }
     };
     ($cond:expr, $msg:literal $(,)?) => {
         if !$cond {
-            return $crate::private::Err($crate::__anyhow!($msg));
+            return $crate::__private::Err($crate::__anyhow!($msg));
         }
     };
     ($cond:expr, $err:expr $(,)?) => {
         if !$cond {
-            return $crate::private::Err($crate::__anyhow!($err));
+            return $crate::__private::Err($crate::__anyhow!($err));
         }
     };
     ($cond:expr, $fmt:expr, $($arg:tt)*) => {
         if !$cond {
-            return $crate::private::Err($crate::__anyhow!($fmt, $($arg)*));
+            return $crate::__private::Err($crate::__anyhow!($fmt, $($arg)*));
         }
     };
 }

src/kind.rs

@@ -40,7 +40,7 @@
 // The anyhow! macro will set up the call in this form:
 //
 //     #[allow(unused_imports)]
-//     use $crate::private::{AdhocKind, TraitKind};
+//     use $crate::__private::{AdhocKind, TraitKind};
 //     let error = $msg;
 //     (&error).anyhow_kind().new(error)
 

src/lib.rs

@@ -634,7 +634,7 @@ pub fn Ok<T>(t: T) -> Result<T> {
 
 // Not public API. Referenced by macro-generated code.
 #[doc(hidden)]
-pub mod private {
+pub mod __private {
     use crate::Error;
     use alloc::fmt;
     use core::fmt::Arguments;

src/macros.rs

@@ -55,13 +55,13 @@
 #[macro_export]
 macro_rules! bail {
     ($msg:literal $(,)?) => {
-        return $crate::private::Err($crate::__anyhow!($msg))
+        return $crate::__private::Err($crate::__anyhow!($msg))
     };
     ($err:expr $(,)?) => {
-        return $crate::private::Err($crate::__anyhow!($err))
+        return $crate::__private::Err($crate::__anyhow!($err))
     };
     ($fmt:expr, $($arg:tt)*) => {
-        return $crate::private::Err($crate::__anyhow!($fmt, $($arg)*))
+        return $crate::__private::Err($crate::__anyhow!($fmt, $($arg)*))
     };
 }
 
@@ -120,24 +120,24 @@ macro_rules! bail {
 macro_rules! ensure {
     ($cond:expr $(,)?) => {
         if !$cond {
-            return $crate::private::Err($crate::Error::msg(
-                $crate::private::concat!("Condition failed: `", $crate::private::stringify!($cond), "`")
+            return $crate::__private::Err($crate::Error::msg(
+                $crate::__private::concat!("Condition failed: `", $crate::__private::stringify!($cond), "`")
             ));
         }
     };
     ($cond:expr, $msg:literal $(,)?) => {
         if !$cond {
-            return $crate::private::Err($crate::__anyhow!($msg));
+            return $crate::__private::Err($crate::__anyhow!($msg));
         }
     };
     ($cond:expr, $err:expr $(,)?) => {
         if !$cond {
-            return $crate::private::Err($crate::__anyhow!($err));
+            return $crate::__private::Err($crate::__anyhow!($err));
         }
     };
     ($cond:expr, $fmt:expr, $($arg:tt)*) => {
         if !$cond {
-            return $crate::private::Err($crate::__anyhow!($fmt, $($arg)*));
+            return $crate::__private::Err($crate::__anyhow!($fmt, $($arg)*));
         }
     };
 }
@@ -189,22 +189,22 @@ macro_rules! ensure {
 #[macro_export]
 macro_rules! anyhow {
     ($msg:literal $(,)?) => {
-        $crate::private::must_use({
-            let error = $crate::private::format_err($crate::private::format_args!($msg));
+        $crate::__private::must_use({
+            let error = $crate::__private::format_err($crate::__private::format_args!($msg));
             error
         })
     };
     ($err:expr $(,)?) => {
-        $crate::private::must_use({
-            use $crate::private::kind::*;
+        $crate::__private::must_use({
+            use $crate::__private::kind::*;
             let error = match $err {
                 error => (&error).anyhow_kind().new(error),
             };
             error
         })
     };
     ($fmt:expr, $($arg:tt)*) => {
-        $crate::Error::msg($crate::private::format!($fmt, $($arg)*))
+        $crate::Error::msg($crate::__private::format!($fmt, $($arg)*))
     };
 }
 
@@ -215,17 +215,17 @@ macro_rules! anyhow {
 #[macro_export]
 macro_rules! __anyhow {
     ($msg:literal $(,)?) => ({
-        let error = $crate::private::format_err($crate::private::format_args!($msg));
+        let error = $crate::__private::format_err($crate::__private::format_args!($msg));
         error
     });
     ($err:expr $(,)?) => ({
-        use $crate::private::kind::*;
+        use $crate::__private::kind::*;
         let error = match $err {
             error => (&error).anyhow_kind().new(error),
         };
         error
     });
     ($fmt:expr, $($arg:tt)*) => {
-        $crate::Error::msg($crate::private::format!($fmt, $($arg)*))
+        $crate::Error::msg($crate::__private::format!($fmt, $($arg)*))
     };
 }

tests/ui/must-use.stderr

@@ -1,4 +1,4 @@
-error: unused return value of `anyhow::private::must_use` that must be used
+error: unused return value of `anyhow::__private::must_use` that must be used
  --> tests/ui/must-use.rs:8:9
   |
 8 |         anyhow!("it failed");