Move ScriptInstance to godot::extras

Author: Bromeon

godot-core/src/engine/mod.rs

@@ -13,14 +13,11 @@ use crate::obj::{bounds, Bounds, Gd, GodotClass, InstanceId};
 // Re-exports of generated symbols
 
 pub use crate::gen::classes::*;
-pub use script_instance::{create_script_instance, ScriptInstance, SiMut};
 
 use crate::builtin::meta::CallContext;
 use crate::sys;
 
 mod manual_extensions;
-mod script_instance;
-pub mod translate;
 
 #[cfg(debug_assertions)]
 use crate::builtin::meta::ClassName;
@@ -50,6 +47,20 @@ pub mod utilities {
     pub use crate::global::*;
 }
 
+#[deprecated = "`godot::engine::translate` has been moved to `godot::extras`."]
+pub mod translate {
+    pub use crate::extras::{tr, tr_n};
+}
+
+#[deprecated = "`create_script_instance` has been moved to `godot::extras`."]
+pub use crate::extras::create_script_instance;
+
+#[deprecated = "`ScriptInstance` has been moved to `godot::extras`."]
+pub use crate::extras::ScriptInstance;
+
+#[deprecated = "`SiMut` has been moved to `godot::extras`."]
+pub use crate::extras::SiMut;
+
 #[deprecated = "`GFile` has been moved to `godot::extras`."]
 pub use crate::extras::GFile;
 

godot-core/src/extras/mod.rs

@@ -7,6 +7,10 @@
 
 mod gfile;
 mod io_error;
+mod script_instance;
+mod translate;
 
 pub use gfile::*;
 pub use io_error::*;
+pub use script_instance::*;
+pub use translate::*;

godot-core/src/engine/script_instance.rs renamed to godot-core/src/extras/script_instance.rs

@@ -15,11 +15,10 @@ use godot_cell::{GdCell, MutGuard};
 
 use crate::builtin::meta::{MethodInfo, PropertyInfo};
 use crate::builtin::{GString, StringName, Variant, VariantType};
+use crate::engine::{Script, ScriptLanguage};
 use crate::obj::{Base, Gd, GodotClass, ScriptBaseMut, ScriptBaseRef};
 use crate::sys;
 
-use super::{Script, ScriptLanguage};
-
 /// Implement custom scripts that can be attached to objects in Godot.
 ///
 /// To use script instances, implement this trait for your own type.

godot-core/src/engine/translate.rs renamed to godot-core/src/extras/translate.rs

@@ -22,7 +22,7 @@ pub use crate::{tr, tr_n};
 /// # let a = Vector2i { x: 0, y: 0 };
 /// # let b = Vector2i { x: 0, y: 0 };
 /// # let context = "context";
-/// use godot::engine::translate::tr;
+/// use godot::extras::tr;
 ///
 /// // Good.
 /// tr!(context; "{a} is a {b}"); // inlined, with context
@@ -65,7 +65,7 @@ macro_rules! tr {
 /// # let b = Vector2i { x: 0, y: 0 };
 /// # let context = "context";
 /// # let n = 2;
-/// use godot::engine::translate::tr_n;
+/// use godot::extras::tr_n;
 ///
 /// // Good.
 /// tr_n!(n, context; "{a} is a {b}", "{a}s are {b}s"); // inlined, with context

godot-core/src/obj/guards.rs

@@ -11,9 +11,8 @@ use godot_ffi::out;
 use std::fmt::Debug;
 use std::ops::{Deref, DerefMut};
 
-use crate::engine::ScriptInstance;
-
-use super::{Gd, GodotClass};
+use crate::extras::ScriptInstance;
+use crate::obj::{Gd, GodotClass};
 
 /// Immutably/shared bound reference guard for a [`Gd`][crate::obj::Gd] smart pointer.
 ///

itest/rust/src/builtin_tests/script/script_instance_tests.rs

@@ -9,10 +9,8 @@ use std::ffi::c_void;
 
 use godot::builtin::meta::{ClassName, FromGodot, MethodInfo, PropertyInfo, ToGodot};
 use godot::builtin::{GString, StringName, Variant, VariantType};
-use godot::engine::{
-    create_script_instance, IScriptExtension, Object, Script, ScriptExtension, ScriptInstance,
-    ScriptLanguage, SiMut,
-};
+use godot::engine::{IScriptExtension, Object, Script, ScriptExtension, ScriptLanguage};
+use godot::extras::{create_script_instance, ScriptInstance, SiMut};
 use godot::global::{MethodFlags, PropertyHint, PropertyUsageFlags};
 use godot::obj::{Base, Gd, WithBaseField};
 use godot::register::{godot_api, GodotClass};

itest/rust/src/engine_tests/translate_test.rs

@@ -7,7 +7,7 @@
 
 use crate::framework::itest;
 use godot::builtin::Vector2;
-use godot::engine::translate::{tr, tr_n};
+use godot::extras::{tr, tr_n};
 
 #[itest]
 fn tr_macro_format() {