Sidecar

Author: Bromeon

godot-core/src/builtin/mod.rs

@@ -59,7 +59,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::string::{ExGStringFind, ExGStringSplit};
+        pub use crate::gen::builtin_classes::gstring::*;
+    }
+
+    /// Manual symbols and default extenders for builtin type [`StringName`].
+    pub mod string_name {
+        pub use crate::builtin::string::{
+            ExStringNameFind, ExStringNameSplit, 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,16 +92,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;

godot-core/src/builtin/string/gstring.rs

@@ -312,6 +312,7 @@ impl_builtin_traits! {
 
 impl_shared_string_api! {
     builtin: GString,
+    builtin_mod: gstring,
     find_builder: ExGStringFind,
     split_builder: ExGStringSplit,
 }

godot-core/src/builtin/string/string_macros.rs

@@ -9,6 +9,7 @@
 macro_rules! impl_shared_string_api {
     (
         builtin: $Builtin:ty,
+        builtin_mod: $builtin_mod:ident,
         find_builder: $FindBuilder:ident,
         split_builder: $SplitBuilder:ident,
     ) => {
@@ -330,7 +331,7 @@ macro_rules! impl_shared_string_api {
         // --------------------------------------------------------------------------------------------------------------------------------------
         // find() support
 
-        #[doc = concat!("Builder for [`", stringify!($Builtin), "::find_ex()`][crate::builtin::strings::", stringify!($FindBuilder), "].")]
+        #[doc = concat!("Manual extender for [`", stringify!($Builtin), "::find_ex`][crate::builtin::", stringify!($builtin_mod), "::", stringify!($FindBuilder), "].")]
         #[must_use]
         pub struct $FindBuilder<'s, 'w> {
             owner: &'s $Builtin,
@@ -406,7 +407,7 @@ macro_rules! impl_shared_string_api {
         // --------------------------------------------------------------------------------------------------------------------------------------
         // split() support
 
-        #[doc = concat!("Builder for [`", stringify!($Builtin), "::split_ex()`][crate::builtin::strings::", stringify!($SplitBuilder), "].")]
+        #[doc = concat!("Manual extender for [`", stringify!($Builtin), "::split_ex`][crate::builtin::", stringify!($builtin_mod), "::", stringify!($SplitBuilder), "].")]
         #[must_use]
         pub struct $SplitBuilder<'s, 'w> {
             owner: &'s $Builtin,

godot-core/src/builtin/string/string_name.rs

@@ -344,6 +344,7 @@ impl_builtin_traits! {
 
 impl_shared_string_api! {
     builtin: StringName,
+    builtin_mod: string_name,
     find_builder: ExStringNameFind,
     split_builder: ExStringNameSplit,
 }