Move save, load etc.: godot::global -> godot::extras

Author: Bromeon

godot-core/src/engine/mod.rs

@@ -47,13 +47,13 @@ pub use crate::extras::GFile;
 pub use crate::extras::IoError;
 
 #[deprecated = "`save` has been moved to `godot::global`."]
-pub use crate::global::save;
+pub use crate::extras::save;
 
 #[deprecated = "`try_save` has been moved to `godot::global`."]
-pub use crate::global::try_save;
+pub use crate::extras::try_save;
 
 #[deprecated = "`load` has been moved to `godot::global`."]
-pub use crate::global::load;
+pub use crate::extras::load;
 
 #[deprecated = "`try_load` has been moved to `godot::global`."]
-pub use crate::global::try_load;
+pub use crate::extras::try_load;

godot-core/src/extras/mod.rs

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

godot-core/src/global/save_load.rs renamed to godot-core/src/extras/save_load.rs

@@ -23,16 +23,13 @@
 //!
 
 mod print;
-mod save_load;
 
 pub use crate::{godot_error, godot_print, godot_print_rich, godot_script_error, godot_warn};
 
 // Some enums are directly re-exported from crate::builtin.
 pub use crate::gen::central::global_enums::*;
 pub use crate::gen::utilities::*;
 
-pub use save_load::*;
-
 // This is needed for generated classes to find symbols, even those that have been moved to crate::builtin.
 #[allow(unused_imports)] // micromanaging imports for generated code is not fun
 pub(crate) use crate::builtin::{Corner, EulerOrder, Side};

godot-core/src/global/mod.rs

@@ -13,7 +13,7 @@ use crate::VariantType;
 // ----------------------------------------------------------------------------------------------------------------------------------------------
 // Static checks
 
-// The impls only compile if those are different types -- ensures type safety through patch
+// The impls only compile if those are different types -- ensures type safety through patch.
 #[allow(dead_code)]
 trait Distinct {}
 impl Distinct for GDExtensionVariantPtr {}

godot-ffi/src/extras.rs

@@ -19,10 +19,9 @@ pub use super::classes::{
     INode2D, INode3D, IObject, IPackedScene, IRefCounted, IResource, ISceneTree, Input, Node,
     Node2D, Node3D, Object, PackedScene, RefCounted, Resource, SceneTree,
 };
-pub use super::extras::{GFile, IoError};
+pub use super::extras::{load, save, try_load, try_save, GFile, IoError};
 pub use super::global::{
-    godot_error, godot_print, godot_print_rich, godot_script_error, godot_warn, load, save,
-    try_load, try_save,
+    godot_error, godot_print, godot_print_rich, godot_script_error, godot_warn,
 };
 
 pub use super::init::{gdextension, ExtensionLibrary, InitLevel};

godot/src/prelude.rs

@@ -5,7 +5,7 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
  */
 
-use godot::global::{load, save, try_load, try_save};
+use godot::extras::{load, save, try_load, try_save};
 use godot::obj::NewGd;
 use godot::register::GodotClass;