fix: rustler update to v0.35.0

Signed-off-by: Fabrizio Sestito <[email protected]>
rhaiscript · Oct 19, 2024 · 26ce19b · 26ce19b
1 parent 2748ce4
commit 26ce19b
Show file tree

Hide file tree

Showing 4 changed files with 131 additions and 209 deletions.
diff --git a/native/rhai_rustler/Cargo.lock b/native/rhai_rustler/Cargo.lock
diff --git a/native/rhai_rustler/src/error.rs b/native/rhai_rustler/src/error.rs
@@ -1,3 +1,5 @@
+use std::panic::RefUnwindSafe;
+
 use thiserror::Error;
 
 use rhai::{EvalAltResult, ParseError};
@@ -49,10 +51,22 @@ pub enum ScopeError {
     ErrorCannotUpdateValueOfConstant,
 }
 
+#[derive(Error, Debug)]
+#[error(transparent)]
+pub struct EvaluationError(pub Box<EvalAltResult>);
+
+impl RefUnwindSafe for EvaluationError {}
+
+impl From<Box<EvalAltResult>> for RhaiRustlerError {
+    fn from(err: Box<EvalAltResult>) -> Self {
+        RhaiRustlerError::EvaluationError(EvaluationError(err))
+    }
+}
+
 #[derive(Error, Debug)]
 pub enum RhaiRustlerError {
     #[error("Error in evaluation: {0}.")]
-    EvalAltResult(#[from] Box<EvalAltResult>),
+    EvaluationError(#[from] EvaluationError),
     #[error("Error when parsing a script: {0}.")]
     ParseError(#[from] ParseError),
     #[error("Error when accessing a scope: {0}.")]
@@ -64,7 +78,7 @@ pub enum RhaiRustlerError {
 impl Encoder for RhaiRustlerError {
     fn encode<'a>(&self, env: Env<'a>) -> Term<'a> {
         match self {
-            RhaiRustlerError::EvalAltResult(err) => {
+            RhaiRustlerError::EvaluationError(EvaluationError(err)) => {
                 let error_atom = match err.unwrap_inner() {
                     EvalAltResult::ErrorSystem(_, _) => atoms::system(),
                     EvalAltResult::ErrorParsing(_, _) => atoms::parsing(),