error cleanup

partiql · Mar 12, 2024 · 94fb662 · 94fb662
1 parent d4906a4
commit 94fb662
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 10 deletions.
diff --git a/partiql-eval/src/error.rs b/partiql-eval/src/error.rs
@@ -45,14 +45,8 @@ pub enum EvaluationError {
     NotYetImplemented(String),
 
     /// Error originating in an extension
-    #[error("Base Table Expression Error: {0}")]
-    ExtensioResultError(BaseTableExprResultError),
-}
-
-impl From<BaseTableExprResultError> for EvaluationError {
-    fn from(e: BaseTableExprResultError) -> Self {
-        EvaluationError::ExtensioResultError(e)
-    }
+    #[error("Base Table Expression Error")]
+    ExtensionResultError(#[from] BaseTableExprResultError),
 }
 
 /// Used when an error occurs during the logical to eval plan conversion. Allows the conversion

diff --git a/partiql/tests/extension_error.rs b/partiql/tests/extension_error.rs
@@ -198,7 +198,7 @@ fn test_context_bad_args_strict() {
     let err = out.unwrap_err();
     assert_eq!(err.errors.len(), 1);
     let err = &err.errors[0];
-    assert_matches!(err, EvaluationError::ExtensioResultError(err) => {
+    assert_matches!(err, EvaluationError::ExtensionResultError(err) => {
         assert_eq!(err.to_string(), "bad arguments")
     });
 }
@@ -248,7 +248,7 @@ fn test_context_runtime_strict() {
     let err = out.unwrap_err();
     assert_eq!(err.errors.len(), 1);
     let err = &err.errors[0];
-    assert_matches!(err, EvaluationError::ExtensioResultError(err) => {
+    assert_matches!(err, EvaluationError::ExtensionResultError(err) => {
         assert_eq!(err.to_string(), "runtime error")
     });
 }