clip

getgrit · Aug 12, 2024 · 8ed3557 · 8ed3557
1 parent 793f050
commit 8ed3557
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/crates/core/src/foreign_function_definition.rs b/crates/core/src/foreign_function_definition.rs
@@ -110,20 +110,16 @@ impl FunctionDefinition<MarzanoQueryContext> for ForeignFunctionDefinition {
         })?;
 
         #[cfg(feature = "external_functions")]
-        let result = function.call(&resolved_str).or_else(|e| {
-            Err(GritPatternError::new(format!(
+        let result = function.call(&resolved_str).map_err(|e| GritPatternError::new(format!(
                 "failed to call function {}: {}",
                 self.name, e
-            )))
-        })?;
+            )))?;
         // END embedded version
 
-        let string = String::from_utf8(result).or_else(|_| {
-            Err(GritPatternError::new(format!(
+        let string = String::from_utf8(result).map_err(|_| GritPatternError::new(format!(
                 "function {} returned did not return a UTF-8 string",
                 self.name,
-            )))
-        })?;
+            )))?;
 
         Ok(FuncEvaluation {
             predicator: true,

diff --git a/crates/core/src/marzano_resolved_pattern.rs b/crates/core/src/marzano_resolved_pattern.rs
@@ -697,9 +697,9 @@ impl<'a> ResolvedPattern<'a, MarzanoQueryContext> for MarzanoResolvedPattern<'a>
             .into()),
             // unsure if this is correct, taken from text
             Self::Files(_files) => {
-                return Err(GritPatternError::new(
+                Err(GritPatternError::new(
                     "cannot linearize files pattern, not implemented yet",
-                ));
+                ))
             }
             // unsure if this is correct, taken from text
             Self::Constant(c) => Ok(c.to_string().into()),