update gdext to v0.1.3 (#43)

TitanNano · web-flow · commit a508c301243e · 2024-07-25T15:58:43.000+02:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -10,8 +10,8 @@ version = "0.1.0"
 edition = "2021"
 
 [workspace.dependencies]
-godot = { git = "https://github.com/godot-rust/gdext", rev = "4c8ea83fc3452485f7b33f2411c136a248457334", features = ["experimental-threads"] }
-godot-cell = { git = "https://github.com/godot-rust/gdext", rev = "4c8ea83fc3452485f7b33f2411c136a248457334" }
+godot = { git = "https://github.com/godot-rust/gdext", tag = "v0.1.3", features = ["experimental-threads"] }
+godot-cell = { git = "https://github.com/godot-rust/gdext", tag = "v0.1.3" }
 itertools = "0.10.3"
 rand = "0.8.5"
 darling = { version = "0.20.3" }
diff --git a/derive/src/attribute_ops.rs b/derive/src/attribute_ops.rs
@@ -35,7 +35,7 @@ pub struct FieldExportOps {
 impl FieldExportOps {
     pub fn hint(&self, span: Span) -> Result<(TokenStream, String), TokenStream> {
         let godot_types = godot_types();
-        let property_hints = quote!(#godot_types::engine::global::PropertyHint);
+        let property_hints = quote!(#godot_types::global::PropertyHint);
         let mut result: Option<(&str, TokenStream, String)> = None;
 
         if self.color_no_alpha {
diff --git a/derive/src/impl_attribute.rs b/derive/src/impl_attribute.rs
@@ -81,7 +81,7 @@ pub fn godot_script_impl(
                                 #godot_types::prelude::FromGodot::try_from_variant(
                                     args.get(#index).ok_or(#godot_types::sys::GDEXTENSION_CALL_ERROR_TOO_FEW_ARGUMENTS)?
                                 ).map_err(|err| {
-                                    #godot_types::log::godot_error!("failed to convert variant for argument {} of {}: {}", stringify!(#arg_name), #fn_name_str,  err);
+                                    #godot_types::global::godot_error!("failed to convert variant for argument {} of {}: {}", stringify!(#arg_name), #fn_name_str,  err);
                                     #godot_types::sys::GDEXTENSION_CALL_ERROR_INVALID_ARGUMENT
                                 })?,
                             }
@@ -107,9 +107,9 @@ pub fn godot_script_impl(
             };
 
             let method_flag = if is_static {
-                quote!(#godot_types::engine::global::MethodFlags::STATIC)
+                quote!(#godot_types::global::MethodFlags::STATIC)
             } else {
-                quote!(#godot_types::engine::global::MethodFlags::NORMAL)
+                quote!(#godot_types::global::MethodFlags::NORMAL)
             };
 
             let description = fnc.attrs.iter()
diff --git a/derive/src/lib.rs b/derive/src/lib.rs
@@ -172,7 +172,7 @@ fn rust_to_variant_type(ty: &syn::Type) -> Result<TokenStream, TokenStream> {
             ty.span() => {
                 use #godot_types::sys::GodotFfi;
 
-                <#path as #godot_types::builtin::meta::GodotType>::Ffi::variant_type()
+                <#path as #godot_types::meta::GodotType>::Ffi::variant_type()
             }
         }),
         T::Verbatim(_) => Err(syn::Error::new(
@@ -193,7 +193,7 @@ fn rust_to_variant_type(ty: &syn::Type) -> Result<TokenStream, TokenStream> {
                 tuple.span() => {
                     use #godot_types::sys::GodotFfi;
 
-                    <#tuple as #godot_types::builtin::meta::GodotType>::Ffi::variant_type()
+                    <#tuple as #godot_types::meta::GodotType>::Ffi::variant_type()
                 }
             })
         }
diff --git a/derive/src/type_paths.rs b/derive/src/type_paths.rs
@@ -14,7 +14,7 @@ pub fn godot_types() -> TokenStream {
 pub fn property_hints() -> TokenStream {
     let godot_types = godot_types();
 
-    quote!(#godot_types::engine::global::PropertyHint)
+    quote!(#godot_types::global::PropertyHint)
 }
 
 pub fn variant_ty() -> TokenStream {
diff --git a/rust-script/src/library.rs b/rust-script/src/library.rs
@@ -6,8 +6,8 @@
 
 use std::collections::BTreeMap;
 
+use godot::global::{MethodFlags, PropertyHint, PropertyUsageFlags};
 use godot::{
-    engine::global::{MethodFlags, PropertyHint, PropertyUsageFlags},
     obj::{EngineBitfield, EngineEnum},
     prelude::{Gd, Object},
     sys::VariantType,
diff --git a/rust-script/src/library/signals.rs b/rust-script/src/library/signals.rs
@@ -6,18 +6,15 @@
 
 use std::marker::PhantomData;
 
-use super::RustScriptPropDesc;
-use godot::{
-    builtin::{
-        meta::{GodotConvert, GodotType, ToGodot},
-        Callable, Dictionary, GString, NodePath, StringName, Variant, Vector2, Vector3,
-    },
-    engine::{
-        global::{Error, PropertyHint},
-        Object,
-    },
-    obj::Gd,
+use godot::builtin::{
+    Callable, Dictionary, GString, NodePath, StringName, Variant, Vector2, Vector3,
 };
+use godot::classes::Object;
+use godot::global::{Error, PropertyHint};
+use godot::meta::{GodotConvert, GodotType, ToGodot};
+use godot::obj::Gd;
+
+use super::RustScriptPropDesc;
 
 pub trait ScriptSignal {
     type Args: SignalArguments;
diff --git a/rust-script/src/runtime/downgrade_self.rs b/rust-script/src/runtime/downgrade_self.rs
@@ -4,10 +4,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-use godot::{
-    builtin::meta::ToGodot,
-    obj::{Gd, GodotClass, Inherits, WithBaseField},
-};
+use godot::meta::ToGodot;
+use godot::obj::{Gd, GodotClass, Inherits, WithBaseField};
 
 pub trait DowngradeSelf: GodotClass {
     fn downgrade_gd<F: FnOnce(Gd<Self>) -> R, R>(&mut self, closure: F) -> R;
diff --git a/rust-script/src/runtime/metadata.rs b/rust-script/src/runtime/metadata.rs
@@ -6,12 +6,10 @@
 
 use std::ops::Deref;
 
-use godot::{
-    builtin::meta::{MethodInfo, PropertyInfo},
-    obj::{EngineBitfield, EngineEnum},
-    prelude::{Array, Dictionary},
-    sys::VariantType,
-};
+use godot::meta::{MethodInfo, PropertyInfo};
+use godot::obj::{EngineBitfield, EngineEnum};
+use godot::prelude::{Array, Dictionary};
+use godot::sys::VariantType;
 
 use crate::apply::Apply;
 
diff --git a/rust-script/src/runtime/mod.rs b/rust-script/src/runtime/mod.rs
@@ -14,13 +14,11 @@ mod rust_script_language;
 
 use std::{collections::HashMap, sync::RwLock};
 
-use godot::{
-    engine::{Engine, RefCounted, ResourceLoader, ResourceSaver, ScriptLanguage},
-    log::godot_warn,
-    obj::GodotClass,
-    prelude::{godot_print, Gd},
-    register::GodotClass,
-};
+use godot::classes::{Engine, RefCounted, ResourceLoader, ResourceSaver, ScriptLanguage};
+use godot::global::godot_warn;
+use godot::obj::GodotClass;
+use godot::prelude::{godot_print, Gd};
+use godot::register::GodotClass;
 use once_cell::sync::Lazy;
 
 use crate::{
diff --git a/rust-script/src/runtime/resource_loader.rs b/rust-script/src/runtime/resource_loader.rs
@@ -4,15 +4,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-use godot::{
-    engine::{
-        file_access, ClassDb, FileAccess, IResourceFormatLoader, IScriptLanguageExtension, Script,
-    },
-    log::godot_print,
-    obj::Base,
-    prelude::{
-        godot_api, GString, Gd, GodotClass, PackedStringArray, StringName, ToGodot, Variant,
-    },
+use godot::classes::{
+    file_access, ClassDb, FileAccess, IResourceFormatLoader, IScriptLanguageExtension, Script,
+};
+use godot::global::godot_print;
+use godot::obj::Base;
+use godot::prelude::{
+    godot_api, GString, Gd, GodotClass, PackedStringArray, StringName, ToGodot, Variant,
 };
 
 use super::{rust_script::RustScript, rust_script_language::RustScriptLanguage};
diff --git a/rust-script/src/runtime/resource_saver.rs b/rust-script/src/runtime/resource_saver.rs
@@ -4,11 +4,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+use godot::classes::{
+    file_access, resource_saver::SaverFlags, FileAccess, IResourceFormatSaver, Script,
+};
 use godot::global;
-use godot::{
-    engine::{file_access, resource_saver::SaverFlags, FileAccess, IResourceFormatSaver, Script},
-    obj::EngineBitfield,
-    prelude::{godot_api, godot_print, GString, Gd, GodotClass, PackedStringArray, Resource},
+use godot::obj::EngineBitfield;
+use godot::prelude::{
+    godot_api, godot_print, GString, Gd, GodotClass, PackedStringArray, Resource,
 };
 
 use super::rust_script::RustScript;
diff --git a/rust-script/src/runtime/rust_script.rs b/rust-script/src/runtime/rust_script.rs
@@ -6,21 +6,17 @@
 
 use std::{cell::RefCell, collections::HashSet, ffi::c_void};
 
-use godot::{
-    builtin::{
-        meta::{MethodInfo, PropertyInfo, ToGodot},
-        Callable,
-    },
-    engine::{
-        create_script_instance, notify::ObjectNotification, object::ConnectFlags, ClassDb, Engine,
-        IScriptExtension, Script, ScriptExtension, ScriptLanguage, WeakRef,
-    },
-    log::{godot_error, godot_print, godot_warn},
-    obj::{EngineEnum, InstanceId, WithBaseField},
-    prelude::{
-        godot_api, Array, Base, Dictionary, GString, Gd, GodotClass, Object, StringName, Variant,
-        VariantArray,
-    },
+use godot::classes::{
+    notify::ObjectNotification, object::ConnectFlags, ClassDb, Engine, IScriptExtension, Object,
+    Script, ScriptExtension, ScriptLanguage, WeakRef,
+};
+use godot::global::{godot_error, godot_print, godot_warn};
+use godot::meta::{MethodInfo, PropertyInfo, ToGodot};
+use godot::obj::script::create_script_instance;
+use godot::obj::{EngineEnum, InstanceId, WithBaseField};
+use godot::prelude::{
+    godot_api, Array, Base, Callable, Dictionary, GString, Gd, GodotClass, StringName, Variant,
+    VariantArray,
 };
 
 use crate::{apply::Apply, script_registry::GodotScriptObject};
@@ -119,7 +115,7 @@ impl RustScript {
                 let result: Option<Gd<Object>> = Gd::try_from_instance_id(id).ok();
                 result
             })
-            .map(|gd_ref| godot::engine::utilities::weakref(gd_ref.to_variant()).to())
+            .map(|gd_ref| godot::global::weakref(gd_ref.to_variant()).to())
             .collect();
     }
 
@@ -198,7 +194,7 @@ impl IScriptExtension for RustScript {
     unsafe fn instance_create(&self, mut for_object: Gd<Object>) -> *mut c_void {
         self.owners
             .borrow_mut()
-            .push(godot::engine::utilities::weakref(for_object.to_variant()).to());
+            .push(godot::global::weakref(for_object.to_variant()).to());
 
         let data = self.create_remote_instance(for_object.clone());
         let instance = RustScriptInstance::new(data, for_object.clone(), self.to_gd());
@@ -220,7 +216,7 @@ impl IScriptExtension for RustScript {
     unsafe fn placeholder_instance_create(&self, for_object: Gd<Object>) -> *mut c_void {
         self.owners
             .borrow_mut()
-            .push(godot::engine::utilities::weakref(for_object.to_variant()).to());
+            .push(godot::global::weakref(for_object.to_variant()).to());
 
         let placeholder = RustScriptPlaceholder::new(self.to_gd());
 
@@ -396,7 +392,7 @@ impl IScriptExtension for RustScript {
     }
 
     // godot script reload hook
-    fn reload(&mut self, _keep_state: bool) -> godot::engine::global::Error {
+    fn reload(&mut self, _keep_state: bool) -> godot::global::Error {
         let owners = self.owners.borrow().clone();
 
         owners.iter().for_each(|owner| {
@@ -417,7 +413,7 @@ impl IScriptExtension for RustScript {
             })
         });
 
-        godot::engine::global::Error::OK
+        godot::global::Error::OK
     }
 
     fn on_notification(&mut self, what: ObjectNotification) {
diff --git a/rust-script/src/runtime/rust_script_instance.rs b/rust-script/src/runtime/rust_script_instance.rs
diff --git a/rust-script/src/runtime/rust_script_language.rs b/rust-script/src/runtime/rust_script_language.rs
diff --git a/rust-script/src/script_registry.rs b/rust-script/src/script_registry.rs
diff --git a/rust-script/tests/script_derive.rs b/rust-script/tests/script_derive.rs

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ fn rust_to_variant_type(ty: &syn::Type) -> Result<TokenStream, TokenStream> {`
`172`	`172`	`ty.span() => {`
`173`	`173`	`use #godot_types::sys::GodotFfi;`
`174`	`174`
`175`		`- <#path as #godot_types::builtin::meta::GodotType>::Ffi::variant_type()`
	`175`	`+ <#path as #godot_types::meta::GodotType>::Ffi::variant_type()`
`176`	`176`	`}`
`177`	`177`	`}),`
`178`	`178`	`T::Verbatim(_) => Err(syn::Error::new(`
`@@ -193,7 +193,7 @@ fn rust_to_variant_type(ty: &syn::Type) -> Result<TokenStream, TokenStream> {`
`193`	`193`	`tuple.span() => {`
`194`	`194`	`use #godot_types::sys::GodotFfi;`
`195`	`195`
`196`		`- <#tuple as #godot_types::builtin::meta::GodotType>::Ffi::variant_type()`
	`196`	`+ <#tuple as #godot_types::meta::GodotType>::Ffi::variant_type()`
`197`	`197`	`}`
`198`	`198`	`})`
`199`	`199`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ pub fn godot_types() -> TokenStream {`
`14`	`14`	`pub fn property_hints() -> TokenStream {`
`15`	`15`	`let godot_types = godot_types();`
`16`	`16`
`17`		`- quote!(#godot_types::engine::global::PropertyHint)`
	`17`	`+ quote!(#godot_types::global::PropertyHint)`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`pub fn variant_ty() -> TokenStream {`