update to mlua 10.0

Author: makspll

Cargo.toml

@@ -65,6 +65,7 @@ bevy_mod_scripting_core = { path = "crates/bevy_mod_scripting_core", version = "
 bevy_mod_scripting_common = { path = "crates/bevy_mod_scripting_common", version = "0.8.0-alpha.2" }
 bevy_mod_scripting_functions = { path = "crates/bevy_mod_scripting_functions", version = "0.8.0-alpha.2" }
 test_utils = { path = "crates/test_utils" }
+mlua = { version = "0.10" }
 
 [dev-dependencies]
 bevy = { workspace = true, default-features = true }

assets/scripts/bevy_api.lua

@@ -6,8 +6,9 @@ function table_to_string(t)
     return result .. "]"
 end
 
-    
+
 function on_event()
+    -- send exit event, to finish after one call
     world:exit()
 
     print(entity) 
@@ -22,7 +23,7 @@ function on_event()
 
     print("\noption")
     -- print(comp:get("option_usize"))
-    print(comp.option_usie)
+    print(comp.option_usize)
     comp.option_usize = 69
     print(comp.option_usize)
     comp.option_usize = nil

crates/bevy_mod_scripting_core/Cargo.toml

@@ -23,7 +23,7 @@ doc_always = []
 mlua_impls = ["mlua"]
 
 [dependencies]
-mlua = { version = "0.9", optional = true }
+mlua = { optional = true, workspace = true }
 bevy = { workspace = true, default-features = false, features = [
     "bevy_asset",
     "reflect_functions",

crates/languages/bevy_mod_scripting_lua/Cargo.toml

@@ -46,7 +46,7 @@ bevy_mod_scripting_functions = { workspace = true, features = [
     "core_functions",
 ] }
 bevy_mod_scripting_derive = { path = "../../bevy_mod_scripting_derive" }
-mlua = { version = "0.9", features = ["vendored", "send", "macros"] }
+mlua = { workspace = true, features = ["vendored", "send", "macros"] }
 parking_lot = "0.12.1"
 serde_json = "1.0.81"
 anyhow = "1.0.75"

crates/languages/bevy_mod_scripting_lua/src/bindings/reference.rs

@@ -60,11 +60,7 @@ impl From<ReflectReference> for LuaReflectReference {
 }
 
 /// Looks up a function in the registry on the given type id
-fn lookup_function<'lua>(
-    lua: &'lua Lua,
-    key: &str,
-    type_id: TypeId,
-) -> Option<Result<Function<'lua>, mlua::Error>> {
+fn lookup_function(lua: &Lua, key: &str, type_id: TypeId) -> Option<Result<Function, mlua::Error>> {
     let function = lookup_dynamic_function(lua, key, type_id);
 
     function.map(|function| {
@@ -103,7 +99,7 @@ fn lookup_dynamic_function_typed<'lua, T: 'static + ?Sized>(
 }
 
 impl UserData for LuaReflectReference {
-    fn add_methods<'lua, T: UserDataMethods<'lua, Self>>(m: &mut T) {
+    fn add_methods<T: UserDataMethods<Self>>(m: &mut T) {
         m.add_meta_function(
             MetaMethod::Index,
             |lua, (self_, key): (LuaReflectReference, LuaScriptValue)| {

crates/languages/bevy_mod_scripting_lua/src/bindings/script_value.rs

@@ -28,8 +28,8 @@ impl From<ScriptValue> for LuaScriptValue {
     }
 }
 
-impl<'lua> FromLua<'lua> for LuaScriptValue {
-    fn from_lua(value: mlua::Value<'lua>, lua: &'lua mlua::Lua) -> mlua::Result<Self> {
+impl FromLua for LuaScriptValue {
+    fn from_lua(value: mlua::Value, _lua: &mlua::Lua) -> mlua::Result<Self> {
         Ok(match value {
             Value::Nil => ScriptValue::Unit,
             Value::Boolean(b) => ScriptValue::Bool(b),
@@ -52,7 +52,7 @@ impl<'lua> FromLua<'lua> for LuaScriptValue {
             _ => {
                 return Err(mlua::Error::FromLuaConversionError {
                     from: value.type_name(),
-                    to: "ScriptValue",
+                    to: "ScriptValue".to_owned(),
                     message: Some("unsupported value type".to_owned()),
                 })
             }
@@ -61,8 +61,8 @@ impl<'lua> FromLua<'lua> for LuaScriptValue {
     }
 }
 
-impl<'lua> IntoLua<'lua> for LuaScriptValue {
-    fn into_lua(self, lua: &'lua mlua::Lua) -> mlua::Result<mlua::Value<'lua>> {
+impl IntoLua for LuaScriptValue {
+    fn into_lua(self, lua: &mlua::Lua) -> mlua::Result<mlua::Value> {
         Ok(match self.0 {
             ScriptValue::Unit => Value::Nil,
             ScriptValue::Bool(b) => Value::Boolean(b),

crates/languages/bevy_mod_scripting_lua/src/bindings/world.rs

@@ -29,7 +29,7 @@ impl LuaWorld {
 }
 
 impl UserData for LuaWorld {
-    fn add_methods<'lua, T: UserDataMethods<'lua, Self>>(methods: &mut T) {
+    fn add_methods<T: UserDataMethods<Self>>(methods: &mut T) {
         // methods.add_meta_function(
         //     MetaMethod::Index,
         //     |lua, (world, key): (LuaWorld, String)| {

crates/languages/bevy_mod_scripting_lua/src/lib.rs

@@ -35,10 +35,10 @@ pub mod prelude {
     pub use crate::mlua::{self, prelude::*, Value};
 }
 
-pub trait LuaEventArg: Args + for<'l> IntoLuaMulti<'l> {}
-impl<T: Args + for<'l> IntoLuaMulti<'l>> LuaEventArg for T {}
+pub trait LuaEventArg: Args + IntoLuaMulti {}
+impl<T: Args + IntoLuaMulti> LuaEventArg for T {}
 
-pub struct LuaScriptingPlugin<A: Args + for<'l> IntoLuaMulti<'l>> {
+pub struct LuaScriptingPlugin<A: Args + IntoLuaMulti> {
     pub scripting_plugin: ScriptingPlugin<A, Lua, ()>,
 }
 
@@ -147,7 +147,7 @@ pub fn lua_context_reload(
 }
 
 #[allow(clippy::too_many_arguments)]
-pub fn lua_handler<A: Args + for<'l> IntoLuaMulti<'l>>(
+pub fn lua_handler<A: Args + IntoLuaMulti>(
     args: A,
     entity: bevy::ecs::entity::Entity,
     script_id: &ScriptId,
@@ -169,7 +169,7 @@ pub fn lua_handler<A: Args + for<'l> IntoLuaMulti<'l>>(
         };
 
         handler
-            .call::<_, ()>(args)
+            .call::<()>(args)
             .map_err(ScriptError::from_mlua_error)?;
         Ok(())
     })