improve errors

This commit is contained in:
Jaroslaw Konik 2025-05-26 07:00:00 +02:00
parent 783183975a
commit 20f2ad8fb1
4 changed files with 14 additions and 13 deletions

View file

@ -294,8 +294,8 @@ const ENTITY_VAR_NAME: &str = "entity";
/// An error that can occur when internal [ScriptingPlugin] systems are being executed
#[derive(Error, Debug)]
pub enum ScriptingError {
#[error("script runtime error: {0}\nscript backtrace:\n{1}")]
RuntimeError(String, String),
#[error("script runtime error: {0}")]
RuntimeError(String),
#[error("script compilation error: {0}")]
CompileError(Box<dyn std::error::Error + Send>),
#[error("no runtime resource present")]

View file

@ -187,7 +187,7 @@ impl Runtime for LuaRuntime {
.expect("Error clearing entity global variable");
result
})
.map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
.map_err(|e| ScriptingError::RuntimeError(e.to_string()))?;
Ok(LuaScriptData)
}
@ -236,14 +236,14 @@ impl Runtime for LuaRuntime {
let func = engine
.globals()
.get::<_, Function>(name)
.map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
.map_err(|e| ScriptingError::RuntimeError(e.to_string()))?;
let args = args
.parse(engine)
.into_iter()
.map(|a| engine.registry_value::<mlua::Value>(&a.0).unwrap());
let result = func
.call::<_, mlua::Value>(Variadic::from_iter(args))
.map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
.map_err(|e| ScriptingError::RuntimeError(e.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::<Function>(&value.0)
.map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
.map_err(|e| ScriptingError::RuntimeError(e.to_string()))?;
let args = args
.into_iter()
.map(|a| engine.registry_value::<mlua::Value>(&a.0).unwrap());
let result = val
.call::<_, mlua::Value>(Variadic::from_iter(args))
.map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
.map_err(|e| ScriptingError::RuntimeError(e.to_string()))?;
Ok(LuaValue::new(engine, result))
})
}

View file

@ -105,7 +105,7 @@ impl Runtime for RhaiRuntime {
engine
.run_ast_with_scope(&mut scope, &ast)
.map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?;
.map_err(|e| ScriptingError::RuntimeError(e.to_string()))?;
scope.remove::<BevyEntity>(ENTITY_VAR_NAME).unwrap();
@ -156,7 +156,7 @@ impl Runtime for RhaiRuntime {
scope.remove::<BevyEntity>(ENTITY_VAR_NAME).unwrap();
match result {
Ok(val) => Ok(RhaiValue(val)),
Err(e) => Err(ScriptingError::RuntimeError(e.to_string(), "".to_string())),
Err(e) => Err(ScriptingError::RuntimeError(e.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.to_string(), "".to_string()))?
.map_err(|e| ScriptingError::RuntimeError(e.to_string()))?
} else {
let args = args.into_iter().map(|a| a.0).collect::<Vec<Dynamic>>();
f.call_raw(ctx, None, args)
.map_err(|e| ScriptingError::RuntimeError(e.to_string(), "".to_string()))?
.map_err(|e| ScriptingError::RuntimeError(e.to_string()))?
};
Ok(RhaiValue(result))

View file

@ -222,7 +222,8 @@ impl TryConvert for BevyVec3 {
impl From<magnus::Error> for ScriptingError {
fn from(value: magnus::Error) -> Self {
ScriptingError::RuntimeError(
ScriptingError::RuntimeError(format!(
"error: {}\nbacktrace:\n{}\n",
value.inspect(),
value
.value()
@ -232,7 +233,7 @@ impl From<magnus::Error> for ScriptingError {
.to_vec::<String>()
.expect("Failed to convert backtrace to vec of strings")
.join("\n"),
)
))
}
}