Clean up godot::register module

Author: Bromeon

godot-core/src/builtin/collections/array.rs

@@ -14,7 +14,9 @@ use crate::builtin::meta::{
 };
 use crate::builtin::*;
 use crate::obj::EngineEnum;
-use crate::property::{builtin_type_string, Export, PropertyHintInfo, TypeStringHint, Var};
+use crate::registry::property::{
+    builtin_type_string, Export, PropertyHintInfo, TypeStringHint, Var,
+};
 use godot_ffi as sys;
 use sys::{ffi_methods, interface_fn, GodotFfi};
 

godot-core/src/builtin/collections/dictionary.rs

@@ -9,7 +9,9 @@ use godot_ffi as sys;
 
 use crate::builtin::meta::{impl_godot_as_self, FromGodot, ToGodot};
 use crate::builtin::{inner, Variant, VariantArray};
-use crate::property::{builtin_type_string, Export, PropertyHintInfo, TypeStringHint, Var};
+use crate::registry::property::{
+    builtin_type_string, Export, PropertyHintInfo, TypeStringHint, Var,
+};
 use sys::types::OpaqueDictionary;
 use sys::{ffi_methods, interface_fn, GodotFfi};
 

godot-core/src/builtin/collections/packed_array.rs

@@ -509,16 +509,16 @@ macro_rules! impl_packed_array {
 
         $crate::builtin::meta::impl_godot_as_self!($PackedArray);
 
-        impl $crate::property::Export for $PackedArray {
-            fn default_export_info() -> $crate::property::PropertyHintInfo {
+        impl $crate::registry::property::Export for $PackedArray {
+            fn default_export_info() -> $crate::registry::property::PropertyHintInfo {
                 // In 4.3 Godot can (and does) use type hint strings for packed arrays, see https://github.com/godotengine/godot/pull/82952.
                 if sys::GdextBuild::since_api("4.3") {
-                    $crate::property::PropertyHintInfo {
+                    $crate::registry::property::PropertyHintInfo {
                         hint: $crate::global::PropertyHint::TYPE_STRING,
-                        hint_string: <$Element as $crate::property::TypeStringHint>::type_string().into(),
+                        hint_string: <$Element as $crate::registry::property::TypeStringHint>::type_string().into(),
                     }
                 } else {
-                    $crate::property::PropertyHintInfo::with_hint_none(
+                    $crate::registry::property::PropertyHintInfo::with_hint_none(
                         <$PackedArray as $crate::builtin::meta::GodotType>::godot_type_name()
                     )
                 }

godot-core/src/builtin/meta/mod.rs

@@ -5,8 +5,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-pub mod registration;
-
 mod call_error;
 mod class_name;
 mod godot_convert;
@@ -22,10 +20,9 @@ pub(crate) use godot_convert::convert_error::*;
 
 use crate::builtin::*;
 use crate::global::{self, PropertyHint, PropertyUsageFlags};
-use crate::property::Var;
-use crate::property::{Export, PropertyHintInfo};
+use crate::registry::method::MethodParamOrReturnInfo;
+use crate::registry::property::{Export, PropertyHintInfo, Var};
 use godot_ffi as sys;
-use registration::method::MethodParamOrReturnInfo;
 use sys::{GodotFfi, GodotNullableFfi};
 
 #[cfg(feature = "trace")]
@@ -318,7 +315,7 @@ impl PropertyInfo {
 
     /// Change the `hint` and `hint_string` to be the given `hint_info`.
     ///
-    /// See [`export_info_functions`](crate::property::export_info_functions) for functions that return appropriate `PropertyHintInfo`s for
+    /// See [`export_info_functions`](crate::registry::property::export_info_functions) for functions that return appropriate `PropertyHintInfo`s for
     /// various Godot annotations.
     ///
     /// # Examples

godot-core/src/builtin/meta/registration/mod.rs

@@ -5,8 +5,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-#![deprecated = "Module has been split into `godot::classes`, `godot::global` and `godot::tools`."]
-
 #[deprecated = "Classes have been moved to `godot::classes`."]
 pub use crate::classes::*;
 

godot-core/src/engine/mod.rs

@@ -139,13 +139,13 @@ fn gdext_on_level_init(level: InitLevel) {
                 sys::load_class_method_table(sys::ClassApiLevel::Editor);
             }
         }
-        crate::auto_register_classes(level);
+        crate::registry::class::auto_register_classes(level);
     }
 }
 
 /// Tasks needed to be done by gdext internally upon unloading an initialization level. Called after user code.
 fn gdext_on_level_deinit(level: InitLevel) {
-    crate::unregister_classes(level);
+    crate::registry::class::unregister_classes(level);
 
     if level == InitLevel::Core {
         // If lowest level is unloaded, call global deinitialization.

godot-core/src/init/mod.rs

@@ -5,40 +5,22 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-mod registry;
-mod storage;
-
+// Note that a lot of those are public, but the godot crate still has the final say on what it wants to re-export.
+// Doing fine-grained visibility restrictions on every level is a useless maintenance chore.
 pub mod builder;
 pub mod builtin;
 pub mod classes;
 pub mod global;
 pub mod init;
 pub mod obj;
+pub mod registry;
+pub mod tools;
 
-#[deprecated = "Print macros have been moved to `godot::global`."]
-pub mod log {
-    pub use crate::global::{
-        godot_error, godot_print, godot_print_rich, godot_script_error, godot_warn,
-    };
-}
-
-#[doc(hidden)]
-#[path = "deprecated.rs"]
-pub mod __deprecated;
-#[doc(hidden)]
-pub mod private;
-
+mod storage;
 pub use godot_ffi as sys;
-#[doc(hidden)]
-pub use godot_ffi::out;
-pub use registry::*;
-pub mod engine;
 
-/// Higher-level additions to the Godot engine API.
-///
-/// Contains functionality that extends existing Godot classes and functions, to make them more versatile
-/// or better integrated with Rust.
-pub mod tools;
+// ----------------------------------------------------------------------------------------------------------------------------------------------
+// Generated code
 
 // Output of generated code. Mimics the file structure, symbols are re-exported.
 #[rustfmt::skip]
@@ -52,6 +34,9 @@ mod gen {
     include!(concat!(env!("OUT_DIR"), "/mod.rs"));
 }
 
+// ----------------------------------------------------------------------------------------------------------------------------------------------
+// API version check
+
 macro_rules! generate_gdextension_api_version {
     (
         $(
@@ -89,3 +74,32 @@ generate_gdextension_api_version!(
         "4.1",
     },
 );
+
+// ----------------------------------------------------------------------------------------------------------------------------------------------
+// Hidden but accessible symbols
+
+/// Module which is used for deprecated warnings. It stays even if there is nothing currently deprecated.
+#[doc(hidden)]
+#[path = "deprecated.rs"]
+pub mod __deprecated;
+
+/// All internal machinery that is accessed by various gdext tools (e.g. proc macros).
+#[doc(hidden)]
+pub mod private;
+
+/// Re-export logging macro.
+#[doc(hidden)]
+pub use godot_ffi::out;
+
+// ----------------------------------------------------------------------------------------------------------------------------------------------
+// Deprecated modules
+
+#[deprecated = "Module has been split into `godot::classes`, `godot::global` and `godot::tools`."]
+pub mod engine;
+
+#[deprecated = "Print macros have been moved to `godot::global`."]
+pub mod log {
+    pub use crate::global::{
+        godot_error, godot_print, godot_print_rich, godot_script_error, godot_warn,
+    };
+}

godot-core/src/lib.rs

@@ -48,8 +48,9 @@
 
 use crate::obj::cap::GodotDefault;
 use crate::obj::{Bounds, Gd, GodotClass, RawGd};
+use crate::registry::callbacks;
 use crate::storage::Storage;
-use crate::{callbacks, out, sys};
+use crate::{out, sys};
 use private::Sealed;
 
 // ----------------------------------------------------------------------------------------------------------------------------------------------

godot-core/src/obj/bounds.rs

@@ -23,7 +23,7 @@ use crate::obj::{
     bounds, cap, Bounds, EngineEnum, GdDerefTarget, GdMut, GdRef, GodotClass, Inherits, InstanceId,
 };
 use crate::private::callbacks;
-use crate::property::{Export, PropertyHintInfo, TypeStringHint, Var};
+use crate::registry::property::{Export, PropertyHintInfo, TypeStringHint, Var};
 use crate::{classes, out};
 
 /// Smart pointer to objects owned by the Godot engine.