Move all ScriptInstance related functionality to godot::obj::script

Author: Bromeon

godot-codegen/src/special_cases/special_cases.rs

@@ -315,7 +315,7 @@ pub fn get_class_extra_docs(class_name: &TyName) -> Option<&'static str> {
             Some("The gdext library provides a higher-level abstraction, which should be preferred: [`GFile`][crate::tools::GFile].")
         }
         "ScriptExtension" => {
-            Some("Use this in combination with [`ScriptInstance`][crate::tools::ScriptInstance].")
+            Some("Use this in combination with the [`obj::script` module][crate::obj::script].")
         }
 
         _ => None,
@@ -325,7 +325,7 @@ pub fn get_class_extra_docs(class_name: &TyName) -> Option<&'static str> {
 pub fn get_interface_extra_docs(trait_name: &str) -> Option<&'static str> {
     match trait_name {
         "IScriptExtension" => {
-            Some("Use this in combination with [`ScriptInstance`][crate::tools::ScriptInstance].")
+            Some("Use this in combination with the [`obj::script` module][crate::obj::script].")
         }
 
         _ => None,

godot-core/src/engine/mod.rs

@@ -31,14 +31,14 @@ pub mod translate {
     pub use crate::tools::{tr, tr_n};
 }
 
-#[deprecated = "`create_script_instance` has been moved to `godot::tools`."]
-pub use crate::tools::create_script_instance;
+#[deprecated = "`create_script_instance` has been moved to `godot::obj::script`."]
+pub use crate::obj::script::create_script_instance;
 
-#[deprecated = "`ScriptInstance` has been moved to `godot::tools`."]
-pub use crate::tools::ScriptInstance;
+#[deprecated = "`ScriptInstance` has been moved to `godot::obj::script`."]
+pub use crate::obj::script::ScriptInstance;
 
-#[deprecated = "`SiMut` has been moved to `godot::tools`."]
-pub use crate::tools::SiMut;
+#[deprecated = "`SiMut` has been moved to `godot::obj::script`."]
+pub use crate::obj::script::SiMut;
 
 #[deprecated = "`GFile` has been moved to `godot::tools`."]
 pub use crate::tools::GFile;

godot-core/src/obj/guards.rs

@@ -11,8 +11,8 @@ use godot_ffi::out;
 use std::fmt::Debug;
 use std::ops::{Deref, DerefMut};
 
+use crate::obj::script::ScriptInstance;
 use crate::obj::{Gd, GodotClass};
-use crate::tools::ScriptInstance;
 
 /// Immutably/shared bound reference guard for a [`Gd`][crate::obj::Gd] smart pointer.
 ///
@@ -173,13 +173,13 @@ make_base_ref!(
     ScriptBaseRef,
     ScriptInstance,
     SiMut,
-    crate::extras::SiMut,
+    crate::obj::script::SiMut,
     "[`ScriptInstance`]"
 );
 make_base_mut!(
     ScriptBaseMut,
     ScriptInstance,
     SiMut,
-    crate::extras::SiMut,
+    crate::obj::script::SiMut,
     "['ScriptInstance']"
 );

godot-core/src/obj/mod.rs

@@ -23,13 +23,14 @@ pub(crate) mod rtti;
 
 pub use base::*;
 pub use gd::*;
-pub use guards::*;
+pub use guards::{BaseMut, BaseRef, GdMut, GdRef};
 pub use instance_id::*;
 pub use onready::*;
 pub use raw::*;
 pub use traits::*;
 
 pub mod bounds;
+pub mod script;
 pub use bounds::private::Bounds;
 
 // Do not re-export rtti here.