Reorganize modules for "builtin sidecars"

Author: Bromeon

godot-core/src/builtin/basis.rs renamed to godot-core/src/builtin/matrices/basis.rs

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) godot-rust; Bromeon and contributors.
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+
+mod basis;
+mod projection;
+mod transform2d;
+mod transform3d;
+
+pub use basis::*;
+pub use projection::*;
+pub use transform2d::*;
+pub use transform3d::*;

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

@@ -10,10 +10,10 @@ use std::ops::Mul;
 use godot_ffi as sys;
 use sys::{ffi_methods, ExtVariantType, GodotFfi};
 
-use super::{Aabb, Rect2, Vector3};
 use crate::builtin::math::{ApproxEq, GlamConv, GlamType};
 use crate::builtin::{
-    inner, real, Plane, RMat4, RealConv, Transform3D, Vector2, Vector4, Vector4Axis,
+    inner, real, Aabb, Plane, RMat4, RealConv, Rect2, Transform3D, Vector2, Vector3, Vector4,
+    Vector4Axis,
 };
 
 /// A 4x4 matrix used for 3D projective transformations.

godot-core/src/builtin/projection.rs renamed to godot-core/src/builtin/matrices/projection.rs

@@ -28,22 +28,19 @@ pub mod __prelude_reexport {
     use super::*;
 
     pub use aabb::*;
-    pub use basis::*;
     pub use callable::*;
     pub use collections::containers::*;
     pub use color::*;
     pub use color_hsv::*;
+    pub use matrices::*;
     pub use plane::*;
-    pub use projection::*;
     pub use quaternion::*;
     pub use real_inner::*;
     pub use rect2::*;
     pub use rect2i::*;
     pub use rid::*;
     pub use signal::*;
-    pub use string::{Encoding, GString, NodePath, StringName};
-    pub use transform2d::*;
-    pub use transform3d::*;
+    pub use strings::{Encoding, GString, NodePath, StringName};
     pub use variant::*;
     pub use vectors::*;
 
@@ -59,7 +56,29 @@ pub mod __prelude_reexport {
     pub use crate::static_sname;
 }
 
+// #[doc(hidden)]
+// pub mod __sidecar_reexport {
+pub use crate::gen::builtin_classes::*;
+
+// Special case for gstring + string_name modules, which have also manually-defined symbols.
+
+/// Manual symbols and default extenders for builtin type [`GString`].
+pub mod gstring {
+    pub use crate::builtin::strings::{GStringExFind as ExFind, GStringExSplit as ExSplit};
+    pub use crate::gen::builtin_classes::gstring::*;
+}
+
+/// Manual symbols and default extenders for builtin type [`StringName`].
+pub mod string_name {
+    pub use crate::builtin::strings::{
+        StringNameExFind as ExFind, StringNameExSplit as ExSplit, TransientStringNameOrd,
+    };
+    pub use crate::gen::builtin_classes::string_name::*;
+}
+// }
+
 pub use __prelude_reexport::*;
+// pub use __sidecar_reexport::*;
 
 /// Math-related functions and traits like [`ApproxEq`][math::ApproxEq].
 pub mod math;
@@ -70,17 +89,6 @@ pub mod iter {
     pub use super::collections::iterators::*;
 }
 
-/// Specialized types related to Godot's various string implementations.
-pub mod strings {
-    pub use super::string::{
-        ExGStringFind, ExGStringSplit, ExStringNameFind, ExStringNameSplit, TransientStringNameOrd,
-    };
-}
-
-pub mod sidecars {
-    pub use crate::gen::builtin_classes::*;
-}
-
 pub(crate) mod meta_reexport {
     pub use super::collections::PackedArrayElement;
 }
@@ -93,22 +101,19 @@ mod macros;
 
 // Other modules
 mod aabb;
-mod basis;
 mod callable;
 mod collections;
 mod color;
 mod color_constants; // After color, so that constants are listed after methods in docs (alphabetic ensures that).
 mod color_hsv;
+mod matrices;
 mod plane;
-mod projection;
 mod quaternion;
 mod rect2;
 mod rect2i;
 mod rid;
 mod signal;
-mod string;
-mod transform2d;
-mod transform3d;
+mod strings;
 mod variant;
 mod vectors;
 

godot-core/src/builtin/transform2d.rs renamed to godot-core/src/builtin/matrices/transform2d.rs

@@ -13,7 +13,7 @@ use godot_ffi as sys;
 use sys::types::OpaqueString;
 use sys::{ffi_methods, interface_fn, ExtVariantType, GodotFfi};
 
-use crate::builtin::string::{pad_if_needed, Encoding};
+use crate::builtin::strings::{pad_if_needed, Encoding};
 use crate::builtin::{inner, NodePath, StringName, Variant};
 use crate::meta::error::StringError;
 use crate::meta::AsArg;
@@ -312,8 +312,7 @@ impl_builtin_traits! {
 
 impl_shared_string_api! {
     builtin: GString,
-    find_builder: ExGStringFind,
-    split_builder: ExGStringSplit,
+    builtin_mod: gstring,
 }
 
 impl fmt::Display for GString {

godot-core/src/builtin/transform3d.rs renamed to godot-core/src/builtin/matrices/transform3d.rs

@@ -13,9 +13,9 @@ mod node_path;
 mod string_macros;
 mod string_name;
 
-pub use gstring::*;
+pub use gstring::{ExFind as GStringExFind, ExSplit as GStringExSplit, *};
 pub use node_path::NodePath;
-pub use string_name::*;
+pub use string_name::{ExFind as StringNameExFind, ExSplit as StringNameExSplit, *};
 
 use crate::meta;
 use crate::meta::error::ConvertError;