Merge pull request #10 from superwall/develop

0.1.12

CHANGELOG.md

@@ -1,27 +1,33 @@
 # CHANGELOG
 
+## 0.1.12
+
+### Fixes
+
+- Adds Result types to fix issues when building for iOS.
+
 ## 0.1.11
 
-## Enhancements
+### Enhancements
 
 - Adds new Android target
 - Ensures JSON deserialization is done in a safe manner
 
 ## 0.1.10
 
-## Enhancements
+### Enhancements
 
 - Updates github workflow for the renaming of the iOS repository.
 
 ## 0.1.9
 
-## Enhancements
+### Enhancements
 
 - Added returning of a JSON encoded `Result<PassableValue,String>` from the exposed methods instead of relying on panics.
   Example JSON:
   - Error: `{"Err":"No such key: should_display"}`
   - Ok: `{"Ok":{"type":"bool","value":true}}`
 
-## Fixes
+### Fixes
 
 - Fixed a bug where getting properties from `device` would panic when `device` functions were defined

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cel-eval"
-version = "0.1.11"
+version = "0.1.12"
 edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.htmlž

src/lib.rs

@@ -61,7 +61,7 @@ pub fn evaluate_ast_with_context(definition: String, host: Arc<dyn HostContext>)
     let data = match data {
         Ok(data) => data,
         Err(_) => {
-            let e = Err("Invalid execution context JSON".to_string());
+            let e : Result<_, String> = Err::<ASTExecutionContext,String>("Invalid execution context JSON".to_string());
             return serde_json::to_string(&e).unwrap()
         }
     };
@@ -87,7 +87,7 @@ pub fn evaluate_ast(ast: String) -> String {
     let data : JSONExpression = match data {
         Ok(data) => data,
         Err(_) => {
-            let e = Err("Invalid definition for AST Execution".to_string());
+            let e : Result<_, String> = Err::<JSONExpression,String>("Invalid definition for AST Execution".to_string());
             return serde_json::to_string(&e).unwrap()
         }
     };
@@ -110,13 +110,7 @@ pub fn evaluate_with_context(definition: String, host: Arc<dyn HostContext>) ->
     let data: ExecutionContext = match data {
         Ok(data) => data,
         Err(_) => {
-            let e = Err("Invalid execution context JSON".to_string());
-            return serde_json::to_string(&e).unwrap()
-        }
-    };
-    let data = match data {
-        Ok(data) => data,
-        Err(e) => {
+            let e : Result<ExecutionContext, String> = Err("Invalid execution context JSON".to_string());
             return serde_json::to_string(&e).unwrap()
         }
     };