merge troubles

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/function/into.rs

@@ -4,7 +4,7 @@ use std::{borrow::Cow, collections::HashMap, ffi::OsString, path::PathBuf};
 use bevy::reflect::Reflect;
 
 use crate::{bindings::{ReflectReference, ScriptValue, WorldGuard}, error::InteropError};
-use super::{DynamicScriptFunction, DynamicScriptFunctionMut, Val};
+use super::{DynamicScriptFunction, DynamicScriptFunctionMut, Union, Val};
 
 /// Converts a value into a [`ScriptValue`].
 pub trait IntoScript {

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

@@ -2,27 +2,35 @@
 
 use super::{
     from::{Mut, Ref, Union, Val},
-    script_function::FunctionCallContext,
+    script_function::FunctionCallContext, DynamicScriptFunction, DynamicScriptFunctionMut,
 };
-use crate::{
-    bindings::{ReflectReference, WorldGuard},
-    error::InteropError, private::{no_type_dependencies, self_type_dependency_only},
-};
-use crate::{bindings::{ReflectReference, ScriptValue}, error::InteropError};
+use crate::
+    bindings::{ReflectReference, ScriptValue}
+;
 use bevy::reflect::{FromReflect, GetTypeRegistration, TypeRegistry, Typed};
 use bevy_mod_scripting_derive::impl_get_type_dependencies;
 use std::{collections::HashMap, ffi::OsString, hash::Hash, path::PathBuf};
 
-/// Functionally identical to [`GetTypeRegistration`] but without the 'static bound
-pub trait GetTypeDependencies {
-    /// In the majority of the implementations, this will be `Self`
-    /// However some types might be `facades` for other types, in which case this will be the underlying type
-    type Underlying;
 
-    /// Registers the type dependencies of the implementing type with the given [`TypeRegistry`].
-    fn register_type_dependencies(registry: &mut TypeRegistry);
+
+macro_rules! impl_get_type_dependencies_primitives {
+    ($($ty:ty),*) => {
+        $(
+            impl_get_type_dependencies!(
+                #[derive(GetTypeDependencies)]
+                #[get_type_dependencies(bms_core_path="crate")]
+                struct $ty where {}
+            );
+        )*
+    };
 }
 
+impl_get_type_dependencies_primitives!(
+    i8, i16, i32, i64, i128, u8, u16, u32, u64, u128, usize, isize, f32, f64, bool,
+    ScriptValue, DynamicScriptFunction, DynamicScriptFunctionMut,
+    String, PathBuf, OsString, char
+);
+
 
 impl GetTypeDependencies for () {
     type Underlying = ();
@@ -31,6 +39,23 @@ impl GetTypeDependencies for () {
     }
 }
 
+impl GetTypeDependencies for &'static str {
+    type Underlying = &'static str;
+    fn register_type_dependencies(registry: &mut TypeRegistry) {
+        registry.register::<&'static str>();
+    }
+}
+
+/// Functionally identical to [`GetTypeRegistration`] but without the 'static bound
+pub trait GetTypeDependencies {
+    /// In the majority of the implementations, this will be `Self`
+    /// However some types might be `facades` for other types, in which case this will be the underlying type
+    type Underlying;
+
+    /// Registers the type dependencies of the implementing type with the given [`TypeRegistry`].
+    fn register_type_dependencies(registry: &mut TypeRegistry);
+}
+
 impl_get_type_dependencies!(
     #[derive(GetTypeDependencies)]
     #[get_type_dependencies(bms_core_path="crate")]

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},