No longer export intermediate modules in core_types

Author: Bromeon

bindings_generator/src/api.rs

@@ -422,7 +422,7 @@ impl Ty {
             Ty::Bool => syn::parse_quote! { bool },
             Ty::Vector2 => syn::parse_quote! { Vector2 },
             Ty::Vector3 => syn::parse_quote! { Vector3 },
-            Ty::Vector3Axis => syn::parse_quote! { vector3::Axis },
+            Ty::Vector3Axis => syn::parse_quote! { Axis },
             Ty::Quat => syn::parse_quote! { Quat },
             Ty::Transform => syn::parse_quote! { Transform },
             Ty::Transform2D => syn::parse_quote! { Transform2D },

gdnative-core/src/core_types/access.rs

@@ -5,21 +5,21 @@ use std::ops::{Deref, DerefMut};
 use std::ptr;
 use std::slice;
 
+/// A pool array access that may be unaligned.
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
-/// An pool array access that may be unaligned.
 pub struct MaybeUnaligned<G> {
     guard: G,
 }
 
+/// A pool array access that is (assumed to be) aligned.
 #[derive(Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
-/// An pool array access that is (assumed to be) aligned.
 pub struct Aligned<G> {
     guard: G,
 }
 
-#[derive(Debug)]
-/// An pool array write access with an owned aligned copy. The data is written back when this is
+/// A pool array write access with an owned aligned copy. The data is written back when this is
 /// dropped.
+#[derive(Debug)]
 pub struct Owned<G>
 where
     G: Guard + WritePtr,

gdnative-core/src/core_types/error.rs

@@ -82,3 +82,6 @@ impl std::fmt::Display for GodotError {
 }
 
 impl std::error::Error for GodotError {}
+
+/// Result type with [GodotError]
+pub type GodotResult = Result<(), GodotError>;

gdnative-core/src/core_types/mod.rs

@@ -1,11 +1,16 @@
-//! Types that represent core-datatypes of Godot.
+//! Types that represent core data types of Godot.
+//!
+//! In contrast to generated Godot class types from the `api` module, the types in here are hand-written in idiomatic Rust and
+//! are the counterparts to built-in types in GDScript.
 
 mod geom;
 
 mod access;
 mod byte_array;
 mod color;
 mod color_array;
+mod dictionary;
+mod error;
 mod float32_array;
 mod int32_array;
 mod node_path;
@@ -20,21 +25,17 @@ mod variant;
 mod variant_array;
 mod vector2;
 mod vector2_array;
+mod vector3;
 mod vector3_array;
 
-pub mod dictionary;
-pub mod error;
-pub mod vector3;
-
-pub use geom::*;
-
 pub use access::*;
 pub use byte_array::*;
 pub use color::*;
 pub use color_array::*;
-pub use dictionary::Dictionary;
-pub use error::GodotError;
+pub use dictionary::*;
+pub use error::{GodotError, GodotResult};
 pub use float32_array::*;
+pub use geom::*;
 pub use int32_array::*;
 pub use node_path::*;
 pub use quat::*;

gdnative-core/src/lib.rs

@@ -59,4 +59,6 @@ pub use init::{InitializeInfo, TerminateInfo};
 pub use new_ref::NewRef;
 pub use object::{GodotObject, Null, Ref, TRef};
 
-pub type GodotResult = Result<(), core_types::error::GodotError>;
+#[deprecated(since = "0.10", note = "use core_types::GodotResult")]
+#[doc(hidden)]
+pub type GodotResult = core_types::GodotResult;

gdnative/src/prelude.rs

@@ -1,16 +1,18 @@
 pub use gdnative_core::core_types::{
-    self, error::GodotError, Aabb, Basis, ByteArray, Color, ColorArray, Dictionary, Float32Array,
+    self, GodotError, Aabb, Basis, ByteArray, Color, ColorArray, Dictionary, Float32Array,
     GodotString, Int32Array, NodePath, Plane, Quat, Rect2, Rid, StringArray, StringName, Transform,
     Transform2D, TypedArray, Variant, VariantArray, VariantDispatch, VariantOperator, VariantType,
     Vector2, Vector2Array, Vector3, Vector3Array,
 };
+
 pub use gdnative_core::core_types::{
     FromVariant, FromVariantError, OwnedToVariant, ToVariant, ToVariantEq,
 };
 
 pub use gdnative_core::object::{
     AsArg, GodotObject, Instanciable, Null, QueueFree, Ref, SubClass, TRef,
 };
+
 pub use gdnative_core::ref_kind::{ManuallyManaged, RefCounted};
 pub use gdnative_core::thread_access::{Shared, ThreadLocal, Unique};
 pub use gdnative_core::NewRef;

test/src/lib.rs

@@ -21,7 +21,7 @@ pub extern "C" fn run_tests(
     let mut status = true;
     status &= gdnative::core_types::test_string();
 
-    status &= gdnative::core_types::dictionary::test_dictionary();
+    status &= gdnative::core_types::test_dictionary();
     // status &= gdnative::test_dictionary_clone_clear();
     status &= gdnative::core_types::test_color();
     status &= gdnative::core_types::test_array();