diff --git a/src/runtimes/lua.rs b/src/runtimes/lua.rs index 42fb9bf..d5ff891 100644 --- a/src/runtimes/lua.rs +++ b/src/runtimes/lua.rs @@ -187,7 +187,7 @@ impl Runtime for LuaRuntime { .expect("Error clearing entity global variable"); result }) - .map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; + .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?; Ok(LuaScriptData) } @@ -236,14 +236,14 @@ impl Runtime for LuaRuntime { let func = engine .globals() .get::<_, Function>(name) - .map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; + .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?; let args = args .parse(engine) .into_iter() .map(|a| engine.registry_value::(&a.0).unwrap()); let result = func .call::<_, mlua::Value>(Variadic::from_iter(args)) - .map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; + .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?; engine .globals() .set(ENTITY_VAR_NAME, mlua::Value::Nil) @@ -261,13 +261,13 @@ impl Runtime for LuaRuntime { self.with_engine(|engine| { let val = engine .registry_value::(&value.0) - .map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; + .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?; let args = args .into_iter() .map(|a| engine.registry_value::(&a.0).unwrap()); let result = val .call::<_, mlua::Value>(Variadic::from_iter(args)) - .map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; + .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?; Ok(LuaValue::new(engine, result)) }) } diff --git a/src/runtimes/rhai.rs b/src/runtimes/rhai.rs index 43c1fa4..c927cbb 100644 --- a/src/runtimes/rhai.rs +++ b/src/runtimes/rhai.rs @@ -105,7 +105,7 @@ impl Runtime for RhaiRuntime { engine .run_ast_with_scope(&mut scope, &ast) - .map_err(|e| ScriptingError::RuntimeError(Box::new(e)))?; + .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?; scope.remove::(ENTITY_VAR_NAME).unwrap(); @@ -156,7 +156,7 @@ impl Runtime for RhaiRuntime { scope.remove::(ENTITY_VAR_NAME).unwrap(); match result { Ok(val) => Ok(RhaiValue(val)), - Err(e) => Err(ScriptingError::RuntimeError(Box::new(e))), + Err(e) => Err(ScriptingError::RuntimeError(e.to_string(), "".to_string())), } } @@ -173,11 +173,11 @@ impl Runtime for RhaiRuntime { let result = if args.len() == 1 && args.first().unwrap().0.is_unit() { f.call_raw(ctx, None, []) - .map_err(|e| ScriptingError::RuntimeError(e))? + .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))? } else { let args = args.into_iter().map(|a| a.0).collect::>(); f.call_raw(ctx, None, args) - .map_err(|e| ScriptingError::RuntimeError(e))? + .map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))? }; Ok(RhaiValue(result)) diff --git a/src/systems.rs b/src/systems.rs index b48931b..7cbf81b 100644 --- a/src/systems.rs +++ b/src/systems.rs @@ -107,7 +107,7 @@ pub(crate) fn init_callbacks(world: &mut World) -> Result<(), Script }, ); if let Err(e) = result { - tracing::error!("error registering function: {:?}", e); + tracing::error!("error registering function: {}", e); } } } @@ -158,7 +158,7 @@ pub(crate) fn process_calls(world: &mut World) -> Result<(), Scripti match result { Ok(_) => {} Err(e) => { - tracing::error!("error resolving call: {} {:?}", callback.name, e); + tracing::error!("error resolving call: {} {}", callback.name, e); } } }