Move export::{Instance,RefInstance} -> object

Author: Bromeon

gdnative-async/src/method.rs

@@ -5,10 +5,11 @@ use std::sync::Arc;
 use futures_task::{LocalFutureObj, LocalSpawn, SpawnError};
 
 use gdnative_core::core_types::{ToVariant, Variant};
+use gdnative_core::export::NativeClass;
 use gdnative_core::export::{Method, Varargs};
-use gdnative_core::export::{NativeClass, RefInstance};
 use gdnative_core::log::{self, Site};
 use gdnative_core::object::ownership::Shared;
+use gdnative_core::object::RefInstance;
 
 use crate::rt::Context;
 

gdnative-async/src/rt.rs

@@ -1,21 +1,19 @@
 use std::marker::PhantomData;
 
+use func_state::FuncState;
 use gdnative_bindings::Object;
-use gdnative_core::object::SubClass;
-
 use gdnative_core::core_types::{GodotError, Variant};
-use gdnative_core::export::{Instance, RefInstance};
 use gdnative_core::init::InitHandle;
 use gdnative_core::object::ownership::Shared;
+use gdnative_core::object::SubClass;
 use gdnative_core::object::TRef;
+use gdnative_core::object::{Instance, RefInstance};
 
 use crate::future;
 
 mod bridge;
 mod func_state;
 
-use func_state::FuncState;
-
 /// Context for creating `yield`-like futures in async methods.
 pub struct Context {
     func_state: Instance<FuncState, Shared>,

gdnative-async/src/rt/bridge.rs

@@ -7,9 +7,10 @@ use gdnative_bindings::{Object, Reference};
 use gdnative_core::core_types::{GodotError, Variant, VariantArray};
 use gdnative_core::export::user_data::{ArcData, Map};
 use gdnative_core::export::{ClassBuilder, Method, Varargs};
-use gdnative_core::export::{Instance, NativeClass, NativeClassMethods, RefInstance};
+use gdnative_core::export::{NativeClass, NativeClassMethods};
 use gdnative_core::godot_site;
 use gdnative_core::object::{ownership::Shared, TRef};
+use gdnative_core::object::{Instance, RefInstance};
 
 use crate::future::Resume;
 

gdnative-async/src/rt/func_state.rs

@@ -4,9 +4,10 @@ use gdnative_core::export::user_data::{LocalCellData, Map, MapMut};
 use gdnative_core::export::{
     ClassBuilder, ExportInfo, PropertyUsage, Signal, SignalArgument, StaticArgs, StaticArgsMethod,
 };
-use gdnative_core::export::{Instance, NativeClass, NativeClassMethods, RefInstance};
+use gdnative_core::export::{NativeClass, NativeClassMethods};
 use gdnative_core::godot_site;
 use gdnative_core::object::ownership::{Shared, Unique};
+use gdnative_core::object::{Instance, RefInstance};
 use gdnative_derive::FromVarargs;
 
 use crate::future::Resume;

gdnative-bindings/src/utils.rs

@@ -1,10 +1,12 @@
 //! Utility functions and extension traits that depend on generated bindings
 
-use super::generated::{Engine, Node, SceneTree};
-use gdnative_core::export::{NativeClass, RefInstance};
+use gdnative_core::export::NativeClass;
 use gdnative_core::object::ownership::Shared;
+use gdnative_core::object::RefInstance;
 use gdnative_core::object::{SubClass, TRef};
 
+use super::generated::{Engine, Node, SceneTree};
+
 /// Convenience method  to obtain a reference to an "auto-load" node, that is a child of the root
 /// node. Returns `None` if the node does not exist or is not of the correct type.
 ///