Move remaining macros to gdnative::log

Author: Bromeon

gdnative-core/src/log.rs

@@ -2,11 +2,14 @@
 use std::ffi::CStr;
 use std::fmt::{self, Display};
 
+// Collection of macros accessing the Godot engine log/print functionality
+pub use crate::{godot_dbg, godot_error, godot_print, godot_site, godot_warn};
+
 use crate::core_types::GodotString;
 use crate::private;
 
 /// Value representing a call site for errors and warnings. Can be constructed
-/// using the `godot_site!` macro, or manually.
+/// using the [`godot_site`] macro, or manually.
 #[derive(Copy, Clone, Debug)]
 pub struct Site<'a> {
     file: &'a CStr,
@@ -45,6 +48,8 @@ impl<'a> Display for Site<'a> {
 
 /// Print a message to the Godot console.
 ///
+/// Typically, you would use this through the [`godot_print`] macro.
+///
 /// # Panics
 ///
 /// If the API isn't initialized.
@@ -58,6 +63,8 @@ pub fn print<S: Display>(msg: S) {
 
 /// Print a warning to the Godot console.
 ///
+/// Typically, you would use this through the [`godot_warn`] macro.
+///
 /// # Panics
 ///
 /// If the API isn't initialized, or if the message contains any NUL-bytes.
@@ -78,6 +85,8 @@ pub fn warn<S: Display>(site: Site<'_>, msg: S) {
 
 /// Print an error to the Godot console.
 ///
+/// Typically, you would use this through the [`godot_error`] macro.
+///
 /// # Panics
 ///
 /// If the API isn't initialized, or if the message contains any NUL-bytes.

gdnative-core/src/macros.rs

@@ -35,16 +35,19 @@ macro_rules! godot_dbg {
     };
 }
 
-/// Creates a `gdnative::log::Site` value from the current position in code,
+/// Creates a [`Site`][crate::log::Site] value from the current position in code,
 /// optionally with a function path for identification.
 ///
 /// # Examples
 ///
 /// ```ignore
+/// use gdnative::log;
+///
 /// // WARN: <unset>: foo At: path/to/file.rs:123
-/// gdnative::log::warn(godot_site!(), "foo");
+/// log::warn(log::godot_site!(), "foo");
+///
 /// // WARN: Foo::my_func: bar At: path/to/file.rs:123
-/// gdnative::log::error(godot_site!(Foo::my_func), "bar");
+/// log::error(log::godot_site!(Foo::my_func), "bar");
 /// ```
 #[macro_export]
 macro_rules! godot_site {

gdnative/src/lib.rs

@@ -60,11 +60,6 @@
 #[doc(inline)]
 pub use gdnative_core::{core_types, export, init, log, object, profiler};
 
-/// Collection of declarative `godot_*` macros, mostly for GDNative registration and output.
-pub mod macros {
-    pub use gdnative_core::{godot_dbg, godot_error, godot_print, godot_warn};
-}
-
 // Implementation details (e.g. used by macros).
 // However, do not re-export macros (on crate level), thus no wildcard
 #[doc(hidden)]