merge

Author: makspll

crates/bevy_mod_scripting_core/src/bindings/function/arg_meta.rs

@@ -3,8 +3,8 @@
 use std::{ffi::OsString, path::PathBuf};
 
 use crate::{
-    bindings::{ScriptValue, ReflectReference},
-    docgen::TypedThrough,
+    bindings::{ReflectReference, ScriptValue},
+    docgen::TypedThrough, error::InteropError,
 };
 
 use super::{

crates/bevy_mod_scripting_core/src/bindings/world.rs

@@ -12,7 +12,7 @@ use super::{
     }, function::{
         namespace::Namespace,
         script_function::{AppScriptFunctionRegistry, DynamicScriptFunction, FunctionCallContext},
-    }, pretty_print::DisplayWithWorld, schedule::AppScheduleRegistry, script_value::ScriptValue, with_global_access, AppReflectAllocator, ReflectBase, ReflectBaseType, ReflectReference, ScriptComponentRegistration, ScriptResourceRegistration, ScriptTypeRegistration
+    }, pretty_print::DisplayWithWorld, schedule::AppScheduleRegistry, script_value::ScriptValue, with_global_access, AppReflectAllocator, ReflectBase, ReflectBaseType, ReflectReference, ScriptComponentRegistration, ScriptResourceRegistration, ScriptTypeRegistration, Union
 };
 use crate::{
     bindings::{function::{from::FromScript, from_ref::FromScriptRef}, with_access_read, with_access_write},

crates/bevy_mod_scripting_core/src/private/mod.rs

@@ -11,28 +11,5 @@ macro_rules! export_all_in_modules {
     };
 }
 
-/// A macro for implementing [`GetTypeDependencies`] for types with no type dependencies.
-macro_rules! no_type_dependencies {
-    ($($path:path),*) => {
-        $(
-            impl $crate::bindings::function::type_dependencies::GetTypeDependencies for $path {
-                fn register_type_dependencies(_registry: &mut bevy::reflect::TypeRegistry) {}
-            }
-        )*
-    };
-}
-
-/// A macro for implementing [`GetTypeDependencies`] for types that only depend on themselves.
-macro_rules! self_type_dependency_only {
-    ($($path:ty),*) => {
-        $(
-            impl $crate::bindings::function::type_dependencies::GetTypeDependencies for $path {
-                fn register_type_dependencies(registry: &mut bevy::reflect::TypeRegistry) {
-                    registry.register::<$path>();
-                }
-            }
-        )*
-    };
-}
 
-pub(crate) use {export_all_in_modules, no_type_dependencies, self_type_dependency_only};
+pub(crate) use export_all_in_modules;